Started a revert of r423389, since it has been causing failures in those tests consistently and has been reverted twice already.

 Issue 654786  has been merged into this issue.

 Issue 653666  has been merged into this issue.

These tests have been flaky for a long time. I'm going to try and deflake them so I can land my WebappRegistry CL.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/beceaa5ebceead7104900401ab96fe2facc26da1

commit beceaa5ebceead7104900401ab96fe2facc26da1
Author: dominickn <dominickn@chromium.org>
Date: Fri Oct 14 00:28:31 2016

[Reland] Refactor WebappRegistry into a singleton instance.

This CL refactors WebappRegistry and WebappDataStorage to make most of
the methods synchronous. WebappRegistry is now a singleton instance that
is instantiated at browser startup. This allows all SharedPreferences files to
be pre-warmed before the class is used; new web apps open new
SharedPreferences on a background thread when registered, after which the
preferences are cached automatically.

Most static methods on WebappRegistry and WebappDataStorage have been
converted to instance methods or removed. This makes the code much
cleaner and more efficient; each static method had to independently open
their SharedPreferences, which minimally performs a stat() on the
underlying XML file to see if it has changed. Now the singleton
WebappRegistry caches all WebappDataStorage objects on startup and
whenever new ones are added. This reduces disk IO overhead.

This CL allows all calls to SharedPreferences.Editor.apply() in
WebappRegistry and WebappDataStorage to occur on the main thread,
mostly removing the need for unwieldy callback interfaces and bare
pointer passing across the JNI.

BUG= 633791 , 653627 

Review-Url: https://codereview.chromium.org/2351113005
Cr-Commit-Position: refs/heads/master@{#425214}

[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/DeferredStartupHandler.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/ServiceTabLauncher.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/ShortcutHelper.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappDataStorage.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/java_sources.gni
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/banners/AppBannerManagerTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataRemoverIntegrationTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/privacy/ClearBrowsingDataPreferencesTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/AddToHomescreenManagerTest.java
[add] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/TestFetchStorageCallback.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappModeTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenIconTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappSplashScreenTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappRegistryTest.java
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/browser/android/chrome_jni_registrar.cc
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/browser/android/webapps/webapp_registry.cc
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/browser/android/webapps/webapp_registry.h
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/browser/browsing_data/browsing_data_remover.cc
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/browser/browsing_data/browsing_data_remover.h
[modify] https://crrev.com/beceaa5ebceead7104900401ab96fe2facc26da1/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

I think I've deflaked this. Closing it out.