Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / android / javatests / src / org / chromium / chrome / browser / infobar / InfoBarTest.java

diff --git a/src/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java b/src/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java
index f47ff05..8999761 100644 (file)
--- a/src/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java
+++ b/src/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.java
@@ -59,9 +59,9 @@ public class InfoBarTest extends ChromeShellTestBase {
 
         List<InfoBar> infoBars = getActivity().getActiveTab().getInfoBarContainer().getInfoBars();
         assertEquals("Wrong infobar count", 1, infoBars.size());
-        assertTrue(InfoBarUtil.hasPrimaryButton(this, infoBars.get(0)));
-        assertFalse(InfoBarUtil.hasSecondaryButton(this, infoBars.get(0)));
-        InfoBarUtil.clickPrimaryButton(this, infoBars.get(0));
+        assertTrue(InfoBarUtil.hasPrimaryButton(infoBars.get(0)));
+        assertFalse(InfoBarUtil.hasSecondaryButton(infoBars.get(0)));
+        InfoBarUtil.clickPrimaryButton(infoBars.get(0));
         assertTrue("InfoBar not removed.", mListener.removeInfoBarAnimationFinished());
         assertEquals("Wrong infobar count", 0, infoBars.size());
 
@@ -83,8 +83,8 @@ public class InfoBarTest extends ChromeShellTestBase {
         // Make sure it has OK/Cancel buttons.
         List<InfoBar> infoBars = getActivity().getActiveTab().getInfoBarContainer().getInfoBars();
         assertEquals("Wrong infobar count", 1, infoBars.size());
-        assertTrue(InfoBarUtil.hasPrimaryButton(this, infoBars.get(0)));
-        assertTrue(InfoBarUtil.hasSecondaryButton(this, infoBars.get(0)));
+        assertTrue(InfoBarUtil.hasPrimaryButton(infoBars.get(0)));
+        assertTrue(InfoBarUtil.hasSecondaryButton(infoBars.get(0)));
 
         loadUrlWithSanitization(HELLO_WORLD_URL);
         assertTrue("InfoBar not removed.", mListener.removeInfoBarAnimationFinished());
@@ -109,22 +109,22 @@ public class InfoBarTest extends ChromeShellTestBase {
 
         // Navigate back and ensure the InfoBar has been removed.
         getInstrumentation().runOnMainSync(
-            new Runnable() {
-                @Override
-                public void run() {
-                    getActivity().getActiveTab().goBack();
-                }
-            });
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        getActivity().getActiveTab().goBack();
+                    }
+                });
         CriteriaHelper.pollForCriteria(
-            new Criteria() {
-                @Override
-                public boolean isSatisfied() {
-                    List<InfoBar> infoBars =
-                            getActivity().getActiveTab().getInfoBarContainer().getInfoBars();
-                    return infoBars.isEmpty();
-                }
-            },
-            MAX_TIMEOUT, CHECK_INTERVAL);
+                new Criteria() {
+                    @Override
+                    public boolean isSatisfied() {
+                        List<InfoBar> infoBars =
+                                getActivity().getActiveTab().getInfoBarContainer().getInfoBars();
+                        return infoBars.isEmpty();
+                    }
+                },
+                MAX_TIMEOUT, CHECK_INTERVAL);
         assertTrue("InfoBar not removed.", mListener.removeInfoBarAnimationFinished());
     }
 }