Replace Shared Prefs commit with apply.

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.webapps;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
@@ skipping 227 matching lines @@
         assertTrue(callback.getCallbackCalled());
         assertTrue(getRegisteredWebapps().isEmpty());
     }
 
     @Test
     @Feature({"Webapp"})
     public void testUnregisterClearsWebappDataStorage() throws Exception {
         addWebappsToRegistry("test");
         SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "test", Context.MODE_PRIVATE);
-        webAppPrefs.edit()
-                .putLong(WebappDataStorage.KEY_LAST_USED, 100L)
-                .commit();
+        webAppPrefs.edit().putLong(WebappDataStorage.KEY_LAST_USED, 100L).apply();
 
         WebappRegistry.unregisterAllWebapps(Robolectric.application, null);
         BackgroundShadowAsyncTask.runBackgroundTasks();
 
         Map<String, ?> actual = webAppPrefs.getAll();
         assertTrue(actual.isEmpty());
     }
 
     @Test
     @Feature({"Webapp"})
       public void testCleanupDoesNotRunTooOften() throws Exception {
         // Put the current time to just before the task should run.
         long currentTime = INITIAL_TIME + WebappRegistry.FULL_CLEANUP_DURATION - 1;
 
         addWebappsToRegistry("oldWebapp");
         SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "oldWebapp", Context.MODE_PRIVATE);
-        webAppPrefs.edit()
-                .putLong(WebappDataStorage.KEY_LAST_USED, Long.MIN_VALUE)
-                .commit();
+        webAppPrefs.edit().putLong(WebappDataStorage.KEY_LAST_USED, Long.MIN_VALUE).apply();
 
         WebappRegistry.unregisterOldWebapps(Robolectric.application, currentTime);
         BackgroundShadowAsyncTask.runBackgroundTasks();
 
         Set<String> actual = mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
         assertEquals(new HashSet<String>(Arrays.asList("oldWebapp")), actual);
 
         long actualLastUsed = webAppPrefs.getLong(WebappDataStorage.KEY_LAST_USED,
                 WebappDataStorage.LAST_USED_INVALID);
         assertEquals(Long.MIN_VALUE, actualLastUsed);
 
         // The last cleanup time was set to 0 in setUp() so check that this hasn't changed.
         long lastCleanup = mSharedPreferences.getLong(WebappRegistry.KEY_LAST_CLEANUP, -1);
         assertEquals(INITIAL_TIME, lastCleanup);
     }
 
     @Test
     @Feature({"Webapp"})
     public void testCleanupDoesNotRemoveRecentApps() throws Exception {
         // Put the current time such that the task runs.
         long currentTime = INITIAL_TIME + WebappRegistry.FULL_CLEANUP_DURATION;
 
         // Put the last used time just inside the no-cleanup window.
         addWebappsToRegistry("recentWebapp");
         SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "recentWebapp", Context.MODE_PRIVATE);
         long lastUsed = currentTime - WebappRegistry.WEBAPP_UNOPENED_CLEANUP_DURATION + 1;
-        webAppPrefs.edit()
-                .putLong(WebappDataStorage.KEY_LAST_USED, lastUsed)
-                .commit();
+        webAppPrefs.edit().putLong(WebappDataStorage.KEY_LAST_USED, lastUsed).apply();
 
         // Because the time is just inside the window, there should be a cleanup but the web app
         // should not be deleted as it was used recently. The last cleanup time should also be
         // set to the current time.
         WebappRegistry.unregisterOldWebapps(Robolectric.application, currentTime);
         BackgroundShadowAsyncTask.runBackgroundTasks();
 
         Set<String> actual = mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
         assertEquals(new HashSet<String>(Arrays.asList("recentWebapp")), actual);
@@ skipping 10 matching lines @@
     @Feature({"Webapp"})
     public void testCleanupRemovesOldApps() throws Exception {
         // Put the current time such that the task runs.
         long currentTime = INITIAL_TIME + WebappRegistry.FULL_CLEANUP_DURATION;
 
         // Put the last used time just outside the no-cleanup window.
         addWebappsToRegistry("oldWebapp");
         SharedPreferences webAppPrefs = Robolectric.application.getSharedPreferences(
                 WebappDataStorage.SHARED_PREFS_FILE_PREFIX + "oldWebapp", Context.MODE_PRIVATE);
         long lastUsed = currentTime - WebappRegistry.WEBAPP_UNOPENED_CLEANUP_DURATION;
-        webAppPrefs.edit()
-                .putLong(WebappDataStorage.KEY_LAST_USED, lastUsed)
-                .commit();
+        webAppPrefs.edit().putLong(WebappDataStorage.KEY_LAST_USED, lastUsed).apply();
 
         // Because the time is just inside the window, there should be a cleanup of old web apps and
         // the last cleaned up time should be set to the current time.
         WebappRegistry.unregisterOldWebapps(Robolectric.application, currentTime);
         BackgroundShadowAsyncTask.runBackgroundTasks();
 
         Set<String> actual = mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
         assertTrue(actual.isEmpty());
 
@@ skipping 336 matching lines @@
                     }
                 }
         );
         BackgroundShadowAsyncTask.runBackgroundTasks();
         Robolectric.runUiThreadTasks();
         assertTrue(mCallbackCalled);
     }
 
     private Set<String> addWebappsToRegistry(String... webapps) {
         final Set<String> expected = new HashSet<String>(Arrays.asList(webapps));
-        mSharedPreferences.edit()
-                .putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected)
-                .commit();
+        mSharedPreferences.edit().putStringSet(WebappRegistry.KEY_WEBAPP_SET, expected).apply();
         return expected;
     }
 
     private Set<String> getRegisteredWebapps() {
         return mSharedPreferences.getStringSet(
                 WebappRegistry.KEY_WEBAPP_SET, Collections.<String>emptySet());
     }
 
     private Intent createShortcutIntent(String url) {
         return ShortcutHelper.createWebappShortcutIntent("id", "action", url,
                 ShortcutHelper.getScopeFromUrl(url), "name", "shortName", null,
                 ShortcutHelper.WEBAPP_SHORTCUT_VERSION, WebDisplayMode.Standalone, 0, 0, 0, false);
     }
 
     private Intent createWebApkIntent(String webappId, String webApkPackage) {
         Intent intent = new Intent();
         intent.putExtra(ShortcutHelper.EXTRA_ID, webappId)
               .putExtra(ShortcutHelper.EXTRA_URL, "https://foo.com")
               .putExtra(ShortcutHelper.EXTRA_WEBAPK_PACKAGE_NAME, webApkPackage);
         return intent;
     }
 }