Rename "icon" to "primary icon" in InstallableManager

chrome/browser/installable/installable_manager_browsertest.cc

Index: chrome/browser/installable/installable_manager_browsertest.cc
diff --git a/chrome/browser/installable/installable_manager_browsertest.cc b/chrome/browser/installable/installable_manager_browsertest.cc
index 405b1fe9616be167da80211c609dee33944355f3..f75d21e9b39c2bef9b17a8aac455b7cd7e1f9eb6 100644
--- a/chrome/browser/installable/installable_manager_browsertest.cc
+++ b/chrome/browser/installable/installable_manager_browsertest.cc
@@ -19,24 +19,24 @@ namespace {
 InstallableParams GetManifestParams() {
   InstallableParams params;
   params.check_installable = false;
-  params.fetch_valid_icon = false;
+  params.fetch_valid_primary_icon = false;
   return params;
 }
 
 InstallableParams GetWebAppParams() {
   InstallableParams params = GetManifestParams();
-  params.ideal_icon_size_in_px = 144;
-  params.minimum_icon_size_in_px = 144;
+  params.ideal_primary_icon_size_in_px = 144;
+  params.minimum_primary_icon_size_in_px = 144;
   params.check_installable = true;
-  params.fetch_valid_icon = true;
+  params.fetch_valid_primary_icon = true;
   return params;
 }
 
 InstallableParams GetIconParams() {
   InstallableParams params = GetManifestParams();
-  params.ideal_icon_size_in_px = 144;
-  params.minimum_icon_size_in_px = 144;
-  params.fetch_valid_icon = true;
+  params.ideal_primary_icon_size_in_px = 144;
+  params.minimum_primary_icon_size_in_px = 144;
+  params.fetch_valid_primary_icon = true;
   return params;
 }
 
@@ -51,9 +51,9 @@ class CallbackTester {
     error_code_ = data.error_code;
     manifest_url_ = data.manifest_url;
     manifest_ = data.manifest;
-    icon_url_ = data.icon_url;
-    if (data.icon)
-      icon_.reset(new SkBitmap(*data.icon));
+    icon_url_ = data.primary_icon_url;
+    if (data.primary_icon)
+      icon_.reset(new SkBitmap(*data.primary_icon));
     is_installable_ = data.is_installable;
     base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, quit_closure_);
   }
@@ -92,9 +92,9 @@ class NestedCallbackTester {
     error_code_ = data.error_code;
     manifest_url_ = data.manifest_url;
     manifest_ = data.manifest;
-    icon_url_ = data.icon_url;
-    if (data.icon)
-      icon_.reset(new SkBitmap(*data.icon));
+    icon_url_ = data.primary_icon_url;
+    if (data.primary_icon)
+      icon_.reset(new SkBitmap(*data.primary_icon));
     is_installable_ = data.is_installable;
 
     manager_->GetData(params_,
@@ -105,8 +105,8 @@ class NestedCallbackTester {
   void OnDidFinishSecondCheck(const InstallableData& data) {
     EXPECT_EQ(error_code_, data.error_code);
     EXPECT_EQ(manifest_url_, data.manifest_url);
-    EXPECT_EQ(icon_url_, data.icon_url);
-    EXPECT_EQ(icon_.get(), data.icon);
+    EXPECT_EQ(icon_url_, data.primary_icon_url);
+    EXPECT_EQ(icon_.get(), data.primary_icon);
     EXPECT_EQ(is_installable_, data.is_installable);
     EXPECT_EQ(manifest_.IsEmpty(), data.manifest.IsEmpty());
     EXPECT_EQ(manifest_.start_url, data.manifest.start_url);
@@ -348,8 +348,8 @@ IN_PROC_BROWSER_TEST_F(InstallableManagerBrowserTest,
         new CallbackTester(run_loop.QuitClosure()));
 
     InstallableParams params = GetWebAppParams();
-    params.ideal_icon_size_in_px = 96;
-    params.minimum_icon_size_in_px = 96;
+    params.ideal_primary_icon_size_in_px = 96;
+    params.minimum_primary_icon_size_in_px = 96;
     RunInstallableManager(tester.get(), params);
     run_loop.Run();
 
@@ -572,8 +572,8 @@ IN_PROC_BROWSER_TEST_F(InstallableManagerBrowserTest,
     // Dial up the icon size requirements to something that isn't available.
     // This should now fail with NoIconMatchingRequirements.
     InstallableParams params = GetWebAppParams();
-    params.ideal_icon_size_in_px = 2000;
-    params.minimum_icon_size_in_px = 2000;
+    params.ideal_primary_icon_size_in_px = 2000;
+    params.minimum_primary_icon_size_in_px = 2000;
     RunInstallableManager(tester.get(), params);
     run_loop.Run();
 
@@ -594,8 +594,8 @@ IN_PROC_BROWSER_TEST_F(InstallableManagerBrowserTest,
 
     // This should fail with NoIconMatchingRequirements.
     InstallableParams params = GetWebAppParams();
-    params.ideal_icon_size_in_px = 2000;
-    params.minimum_icon_size_in_px = 2000;
+    params.ideal_primary_icon_size_in_px = 2000;
+    params.minimum_primary_icon_size_in_px = 2000;
     NavigateAndRunInstallableManager(tester.get(), params,
                                      "/banners/manifest_test_page.html");
     run_loop.Run();