Rename "icon" to "primary icon" in InstallableManager

chrome/browser/android/webapk/webapk_update_data_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/webapk_update_data_fetcher.h"
 
 #include <jni.h>
 #include <vector>
 
 #include "base/android/jni_array.h"
@@ skipping 94 matching lines @@
     return;
   is_initial_fetch_ = last_fetched_url_.is_empty();
   last_fetched_url_ = url;
 
   if (!IsInScope(url, scope_)) {
     OnWebManifestNotWebApkCompatible();
     return;
   }
 
   InstallableParams params;
-  params.ideal_icon_size_in_px =
+  params.ideal_primary_icon_size_in_px =
       ShortcutHelper::GetIdealHomescreenIconSizeInPx();
-  params.minimum_icon_size_in_px =
+  params.minimum_primary_icon_size_in_px =
       ShortcutHelper::GetMinimumHomescreenIconSizeInPx();
   params.check_installable = true;
-  params.fetch_valid_icon = true;
+  params.fetch_valid_primary_icon = true;
   InstallableManager::CreateForWebContents(web_contents());
   InstallableManager* installable_manager =
       InstallableManager::FromWebContents(web_contents());
   installable_manager->GetData(
       params,
       base::Bind(&WebApkUpdateDataFetcher::OnDidGetInstallableData,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkUpdateDataFetcher::OnDidGetInstallableData(
@@ skipping 14 matching lines @@
   // change, we will treat the new Web Manifest as the one of another WebAPK.
   if (data.error_code != NO_ERROR_DETECTED ||
       data.manifest.IsEmpty() || web_manifest_url_ != data.manifest_url ||
       !AreWebManifestUrlsWebApkCompatible(data.manifest)) {
     OnWebManifestNotWebApkCompatible();
     return;
   }
 
   info_.UpdateFromManifest(data.manifest);
   info_.manifest_url = data.manifest_url;
-  info_.best_icon_url = data.icon_url;
-  best_icon_ = *data.icon;
+  info_.best_icon_url = data.primary_icon_url;
+  best_icon_ = *data.primary_icon;
 
   icon_hasher_.reset(new WebApkIconHasher());
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   icon_hasher_->DownloadAndComputeMurmur2Hash(
       profile->GetRequestContext(),
-      data.icon_url,
+      data.primary_icon_url,
       base::Bind(&WebApkUpdateDataFetcher::OnGotIconMurmur2Hash,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkUpdateDataFetcher::OnGotIconMurmur2Hash(
     const std::string& best_icon_murmur2_hash) {
   icon_hasher_.reset();
 
   if (best_icon_murmur2_hash.empty()) {
     OnWebManifestNotWebApkCompatible();
@@ skipping 34 matching lines @@
       info.background_color);
 }
 
 void WebApkUpdateDataFetcher::OnWebManifestNotWebApkCompatible() {
   if (!is_initial_fetch_)
     return;
 
   Java_WebApkUpdateDataFetcher_onWebManifestForInitialUrlNotWebApkCompatible(
       base::android::AttachCurrentThread(), java_ref_);
 }