Merge 59 [Android WebAPK] Fix regression by https://codereview.chromium.org/2725813004/

chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
index 6a2286b96221dccc0ff2b9bc1762c5ddf849a714..4cfcc501a817e296e59f38a7d59fc77fee59332a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebApkActivity.java
@@ -124,10 +124,6 @@ public class WebApkActivity extends WebappActivity {
     protected void onDeferredStartupWithStorage(WebappDataStorage storage) {
         super.onDeferredStartupWithStorage(storage);
 
-        // Initialize the time of the last is-update-needed check with the registration time. This
-        // prevents checking for updates on the first run.
-        storage.updateTimeOfLastCheckForUpdatedWebManifest();
-
         mUpdateManager = new WebApkUpdateManager(WebApkActivity.this, storage);
         mUpdateManager.updateIfNeeded(getActivityTab(),
                 (WebApkInfo) mWebappInfo);
@@ -144,6 +140,10 @@ public class WebApkActivity extends WebappActivity {
                 mWebappInfo.id(), new WebappRegistry.FetchWebappDataStorageCallback() {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {
+                        // Initialize the time of the last is-update-needed check with the
+                        // registration time. This prevents checking for updates on the first run.
+                        storage.updateTimeOfLastCheckForUpdatedWebManifest();
+
                         onDeferredStartupWithStorage(storage);
                     }
                 });