Rename "icon" to "primary icon" in InstallableManager

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.cc

 // Copyright 2015 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/webapps/add_to_homescreen_data_fetcher.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 29 matching lines @@
 // screen shortcut.
 GURL GetShortcutUrl(content::BrowserContext* browser_context,
                     const GURL& actual_url) {
   return dom_distiller::url_utils::GetOriginalUrlFromDistillerUrl(actual_url);
 }
 
 InstallableParams ParamsToPerformInstallableCheck(int ideal_icon_size_in_px,
                                                   int minimum_icon_size_in_px,
                                                   bool check_installable) {
   InstallableParams params;
-  params.ideal_icon_size_in_px = ideal_icon_size_in_px;
-  params.minimum_icon_size_in_px = minimum_icon_size_in_px;
+  params.ideal_primary_icon_size_in_px = ideal_icon_size_in_px;
+  params.minimum_primary_icon_size_in_px = minimum_icon_size_in_px;
   params.check_installable = check_installable;
-  params.fetch_valid_icon = true;
+  params.fetch_valid_primary_icon = true;
   return params;
 }
 
 }  // namespace
 
 AddToHomescreenDataFetcher::AddToHomescreenDataFetcher(
     content::WebContents* web_contents,
     int ideal_icon_size_in_px,
     int minimum_icon_size_in_px,
     int ideal_splash_image_size_in_px,
@@ skipping 147 matching lines @@
     shortcut_info_.manifest_url = data.manifest_url;
   }
 
   // Save the splash screen URL for the later download.
   splash_screen_url_ = ManifestIconSelector::FindBestMatchingIcon(
       data.manifest.icons, ideal_splash_image_size_in_px_,
       minimum_splash_image_size_in_px_);
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
-  if (data.icon) {
-    shortcut_info_.best_icon_url = data.icon_url;
+  if (data.primary_icon) {
+    shortcut_info_.best_icon_url = data.primary_icon_url;
 
-    CreateLauncherIcon(*(data.icon));
+    CreateLauncherIcon(*(data.primary_icon));
     return;
   }
 
   FetchFavicon();
 }
 
 void AddToHomescreenDataFetcher::FetchFavicon() {
   if (!web_contents() || !weak_observer_)
     return;
 
@@ skipping 77 matching lines @@
 void AddToHomescreenDataFetcher::NotifyObserver(const SkBitmap& icon) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!web_contents() || !weak_observer_ || is_icon_saved_)
     return;
 
   is_icon_saved_ = true;
   shortcut_icon_ = icon;
   is_ready_ = true;
   weak_observer_->OnDataAvailable(shortcut_info_, shortcut_icon_);
 }