| Index: chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
|
| index b8f6a91f3514a43636c9a063de9d9978d48d6452..8d74b49c08f2aa5342ebc941011f72ca7b030a47 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java
|
| @@ -280,30 +280,21 @@ public class UrlManagerTest extends InstrumentationTestCase {
|
| }
|
|
|
| @SmallTest
|
| - public void testUpgradeFrom1or2() throws Exception {
|
| - String oldPrefsFile = "org.chromium.chrome.browser.physicalweb.URL_CACHE";
|
| - final String arbitraryKey = "arbitrary_key";
|
| + public void testUpgradeFromNone() throws Exception {
|
| Context context = getInstrumentation().getTargetContext().getApplicationContext();
|
| - final SharedPreferences oldPrefs =
|
| - context.getSharedPreferences(oldPrefsFile, Context.MODE_PRIVATE);
|
| - oldPrefs.edit()
|
| - .putInt(arbitraryKey, 1)
|
| - .apply();
|
| mSharedPreferences.edit()
|
| .remove(UrlManager.getVersionKey())
|
| .apply();
|
| new UrlManager(context);
|
|
|
| - // Make sure the old prefs are cleared.
|
| + // Make sure the new prefs are populated.
|
| CriteriaHelper.pollInstrumentationThread(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| - return mSharedPreferences.contains(UrlManager.getVersionKey())
|
| - && !oldPrefs.contains(arbitraryKey);
|
| + return mSharedPreferences.contains(UrlManager.getVersionKey());
|
| }
|
| }, 5000, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
|
|
|
| - // Make sure the new prefs are populated.
|
| assertEquals(UrlManager.getVersion(),
|
| mSharedPreferences.getInt(UrlManager.getVersionKey(), 0));
|
| }
|
|
|