Update WebAPK if homescreen icon changed.

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 "base/android/jni_string.h"
+#include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/shortcut_info.h"
+#include "chrome/browser/manifest/manifest_icon_selector.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 "url/gurl.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace {
@@ skipping 60 matching lines @@
 }
 
 void ManifestUpgradeDetectorFetcher::DidFinishLoad(
     content::RenderFrameHost* render_frame_host,
     const GURL& validated_url) {
   if (render_frame_host->GetParent())
     return;
   if (!IsInScope(validated_url, scope_))
     return;
 
   web_contents()->GetManifest(

[dominickn, 2016/08/15 05:27:35]

Now that InstallableManager has landed, it would be ideal if this class could
use it so we can reduce the amount of boilerplate fetching code. As I understand
it, the flow currently goes:

1. [Java] Start the native side
2. [C++] GetManifest, ask Java for icon sizes
3. [Java] Return icon sizes
4. [C++] Select icon, update shortcut info, send to Java
5. [Java] Create FetchedManifestData, call back to C++ to download icon
6. [C++] Download icon, calculate hash, send to Java
7. [Java] Compare if we need to do an upgrade.

Can this become:

1 [Java] Start the native side, sending over the icon sizes
2. [C++] Run installable manager, including downloading an icon and computing
hash. Send everything to Java
3. [Java] Compare if we need to do an upgrade

[pkotwicz, 2016/08/15 20:15:03]

I have changed manifest_upgrade_detector_fetcher.cc to use InstallableManager.

Patch Set #5 changes when a change in the homescreen icon triggers a request for
an updated WebAPK (See the diff in ManifestUpgradeDetector#onGotManifestData()
from the previous patch set) but I am OK with this change (and so is yfriedman@)

       base::Bind(&ManifestUpgradeDetectorFetcher::OnDidGetManifest,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ManifestUpgradeDetectorFetcher::OnDidGetManifest(
     const GURL& manifest_url,
     const content::Manifest& manifest) {
   // If the manifest is empty, it means the current WebContents doesn't
   // associate with a Web Manifest. In such case, we ignore the empty manifest
   // and continue observing the WebContents's loading until we find a page that
   // links to the Web Manifest that we are looking for.
   // If the manifest URL is different from the current one, we will continue
   // observing too. It is based on our assumption that it is invalid for
   // web developers to change the Web Manifest location. When it does
   // change, we will treat the new Web Manifest as the one of another WebAPK.
   if (manifest.IsEmpty() || web_manifest_url_ != manifest_url)
     return;
 
   ShortcutInfo info(GURL::EmptyGURL());
   info.UpdateFromManifest(manifest);
   info.manifest_url = manifest_url;
 
+  int ideal_homescreen_icon_size_in_dp =
+      ShortcutHelper::GetIdealHomescreenIconSizeInDp();
+  int minimum_homescreen_icon_size_in_dp =
+      ShortcutHelper::GetMinimumHomescreenIconSizeInDp();
+  info.icon_url = ManifestIconSelector::FindBestMatchingIcon(
+      manifest.icons, ideal_homescreen_icon_size_in_dp,
+      minimum_homescreen_icon_size_in_dp);
+
   OnDataAvailable(info);
 }
 
 void ManifestUpgradeDetectorFetcher::OnDataAvailable(const ShortcutInfo& info) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_scope =
       base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
   ScopedJavaLocalRef<jstring> java_name =
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
+  ScopedJavaLocalRef<jstring> java_icon_url =
+      base::android::ConvertUTF8ToJavaString(env, info.icon_url.spec());
 
   Java_ManifestUpgradeDetectorFetcher_onDataAvailable(
       env, java_ref_.obj(),
       java_url.obj(),
       java_scope.obj(),
       java_name.obj(),
       java_short_name.obj(),
+      java_icon_url.obj(),
       info.display,
       info.orientation,
       info.theme_color,
       info.background_color);
 }