Index: chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java |
index 346fb69db030c9c5f573be91dc9411b08801752f..ea1b23f07c1a636da33b8910e5236793f8504bbf 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java |
@@ -40,13 +40,13 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
+ "<body>Not Webapp capable</body></html>"); |
private static class TestObserver implements ChromeShellApplicationObserver { |
- Intent firedIntent; |
+ Intent mFiredIntent; |
@Override |
public boolean onSendBroadcast(Intent intent) { |
if (intent.hasExtra(Intent.EXTRA_SHORTCUT_NAME)) { |
// Stop a shortcut from really being added. |
- firedIntent = intent; |
+ mFiredIntent = intent; |
return false; |
} |
@@ -54,7 +54,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
} |
public void reset() { |
- firedIntent = null; |
+ mFiredIntent = null; |
} |
} |
@@ -84,7 +84,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
public void testAddWebappShortcuts() throws InterruptedException { |
// Add a webapp shortcut and make sure the intent's parameters make sense. |
addShortcutToURL(WEBAPP_HTML, ""); |
- Intent firedIntent = mTestObserver.firedIntent; |
+ Intent firedIntent = mTestObserver.mFiredIntent; |
assertEquals(WEBAPP_TITLE, firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)); |
Intent launchIntent = firedIntent.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT); |
@@ -95,7 +95,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
// Add a second shortcut and make sure it matches the second webapp's parameters. |
mTestObserver.reset(); |
addShortcutToURL(SECOND_WEBAPP_HTML, ""); |
- Intent newFiredIntent = mTestObserver.firedIntent; |
+ Intent newFiredIntent = mTestObserver.mFiredIntent; |
assertEquals(SECOND_WEBAPP_TITLE, |
newFiredIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)); |
@@ -115,7 +115,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
addShortcutToURL(NORMAL_HTML, ""); |
// Make sure the intent's parameters make sense. |
- Intent firedIntent = mTestObserver.firedIntent; |
+ Intent firedIntent = mTestObserver.mFiredIntent; |
assertEquals(NORMAL_TITLE, firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)); |
Intent launchIntent = firedIntent.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT); |
@@ -133,7 +133,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
public void testAddWebappShortcutsWithoutTitleEdit() throws InterruptedException { |
// Add a webapp shortcut to check unedited title. |
addShortcutToURL(WEBAPP_HTML, ""); |
- Intent firedIntent = mTestObserver.firedIntent; |
+ Intent firedIntent = mTestObserver.mFiredIntent; |
assertEquals(WEBAPP_TITLE, firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)); |
} |
@@ -146,7 +146,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
public void testAddWebappShortcutsWithTitleEdit() throws InterruptedException { |
// Add a webapp shortcut to check edited title. |
addShortcutToURL(WEBAPP_HTML, EDITED_WEBAPP_TITLE); |
- Intent firedIntent = mTestObserver.firedIntent; |
+ Intent firedIntent = mTestObserver.mFiredIntent; |
assertEquals(EDITED_WEBAPP_TITLE , firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME)); |
} |
@@ -167,7 +167,7 @@ public class ShortcutHelperTest extends ChromeShellTestBase { |
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() { |
@Override |
public boolean isSatisfied() { |
- return mTestObserver.firedIntent != null; |
+ return mTestObserver.mFiredIntent != null; |
} |
})); |
} |