Make the timing of ManifestUpgradeDetectorFetcher::Start() call less subtle

chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.cc

 // 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.
 
 #include "chrome/browser/android/webapk/manifest_upgrade_detector_fetcher.h"
 
 #include <jni.h>
 #include <vector>
 
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/webapk_icon_hasher.h"
 #include "chrome/browser/android/webapk/webapk_web_manifest_checker.h"
 #include "chrome/browser/installable/installable_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/manifest.h"
 #include "jni/ManifestUpgradeDetectorFetcher_jni.h"
 #include "third_party/smhasher/src/MurmurHash2.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
@@ skipping 53 matching lines @@
 void ManifestUpgradeDetectorFetcher::Destroy(JNIEnv* env,
                                              const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 void ManifestUpgradeDetectorFetcher::Start(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& java_web_contents) {
   ReplaceWebContents(env, obj, java_web_contents);
+  if (!web_contents()->IsLoading())
+    FetchInstallableData();
 }
 
-void ManifestUpgradeDetectorFetcher::DidFinishLoad(
-    content::RenderFrameHost* render_frame_host,
-    const GURL& validated_url) {
-  if (render_frame_host->GetParent())
+void ManifestUpgradeDetectorFetcher::DidStopLoading() {
+  FetchInstallableData();
+}
+
+void ManifestUpgradeDetectorFetcher::FetchInstallableData() {
+  GURL url = web_contents()->GetLastCommittedURL();
+
+  // DidStopLoading() can be called multiple times for a single URL. Only fetch
+  // installable data the first time.
+  if (url == last_fetched_url_)
     return;
-  if (!IsInScope(validated_url, scope_))
+  last_fetched_url_ = url;
+
+  if (!IsInScope(url, scope_))
     return;
 
   InstallableParams params;
   params.ideal_icon_size_in_dp =
       ShortcutHelper::GetIdealHomescreenIconSizeInDp();
   params.minimum_icon_size_in_dp =
       ShortcutHelper::GetMinimumHomescreenIconSizeInDp();
   params.check_installable = true;
   params.fetch_valid_icon = true;
   InstallableManager::CreateForWebContents(web_contents());
@@ skipping 72 matching lines @@
   ScopedJavaLocalRef<jstring> java_icon_murmur2_hash =
       base::android::ConvertUTF8ToJavaString(env, icon_murmur2_hash);
   ScopedJavaLocalRef<jobject> java_bitmap =
       gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   Java_ManifestUpgradeDetectorFetcher_onDataAvailable(
       env, java_ref_, java_url, java_scope, java_name, java_short_name,
       java_icon_url, java_icon_murmur2_hash, java_bitmap, info.display,
       info.orientation, info.theme_color, info.background_color);
 }