| Index: chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java | 
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java | 
| index d77bd8a8124b4d43dfd810d9f9b41542e94cd823..1c6b4e399e4b14a2896774ee11ae2c9e64bbc177 100644 | 
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java | 
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java | 
| @@ -4,21 +4,20 @@ | 
|  | 
| package org.chromium.chrome.browser.infobar; | 
|  | 
| +import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; | 
| + | 
| import android.test.suitebuilder.annotation.MediumTest; | 
| import android.test.suitebuilder.annotation.Smoke; | 
|  | 
| -import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout; | 
| - | 
| import org.chromium.base.test.util.Feature; | 
| import org.chromium.base.test.util.UrlUtils; | 
| +import org.chromium.chrome.shell.ChromiumTestShellTestBase; | 
| import org.chromium.chrome.test.util.InfoBarTestAnimationListener; | 
| import org.chromium.chrome.test.util.InfoBarUtil; | 
| import org.chromium.chrome.test.util.TestHttpServerClient; | 
| -import org.chromium.chrome.testshell.ChromiumTestShellTestBase; | 
| import org.chromium.content.browser.test.util.Criteria; | 
| import org.chromium.content.browser.test.util.CriteriaHelper; | 
|  | 
| - | 
| import java.util.List; | 
|  | 
| public class InfoBarTest extends ChromiumTestShellTestBase { | 
|  |