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

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

 // Copyright 2016 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 android.content.Intent;
 import android.os.Bundle;
 
 import org.chromium.base.ContextUtils;
@@ skipping 106 matching lines @@
         // renderer processes by declaring the Chrome's renderer service in its AndroidManifest.xml
         // and sets {@link ChildProcessCreationParams} for WebAPK's renderer process so the
         // {@link ChildProcessLauncher} knows which application's renderer service to connect to.
         initializeChildProcessCreationParams(mCanLaunchRendererInWebApkProcess);
     }
 
     @Override
     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);
     }
 
     @Override
     protected void onDeferredStartupWithNullStorage() {
         super.onDeferredStartupWithNullStorage();
 
         // Register the WebAPK. The WebAPK is not registered when it is created so it has to be
         // registered now. The WebAPK may also become unregistered after a user clears Chrome's
         // data.
         WebappRegistry.getInstance().register(
                 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);
                     }
                 });
     }
 
     @Override
     public void onPause() {
         super.onPause();
         initializeChildProcessCreationParams(false);
     }
@@ skipping 17 matching lines @@
     }
 
     @Override
     protected void onDestroyInternal() {
         if (mUpdateManager != null) {
             mUpdateManager.destroy();
         }
         super.onDestroyInternal();
     }
 }