Rename best icon to best primary icon in Web app related code.

chrome/browser/android/webapk/webapk_update_manager.cc

Index: chrome/browser/android/webapk/webapk_update_manager.cc
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc
index 835cb6027da09514bbf304fe94893f97f56e7aab..235dab3f0e8b2eb842b52493e64f3fb4ae8bcd84 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -54,8 +54,8 @@ static void UpdateAsync(
     const JavaParamRef<jstring>& java_scope,
     const JavaParamRef<jstring>& java_name,
     const JavaParamRef<jstring>& java_short_name,
-    const JavaParamRef<jstring>& java_best_icon_url,
-    const JavaParamRef<jobject>& java_best_icon_bitmap,
+    const JavaParamRef<jstring>& java_best_primary_icon_url,
+    const JavaParamRef<jobject>& java_best_primary_icon_bitmap,
     const JavaParamRef<jobjectArray>& java_icon_urls,
     const JavaParamRef<jobjectArray>& java_icon_hashes,
     jint java_display_mode,
@@ -78,7 +78,8 @@ static void UpdateAsync(
   GURL start_url(ConvertJavaStringToUTF8(env, java_start_url));
   GURL scope(ConvertJavaStringToUTF8(env, java_scope));
   GURL web_manifest_url(ConvertJavaStringToUTF8(env, java_web_manifest_url));
-  GURL best_icon_url(ConvertJavaStringToUTF8(env, java_best_icon_url));
+  GURL best_primary_icon_url(
+      ConvertJavaStringToUTF8(env, java_best_primary_icon_url));
   ShortcutInfo info(start_url);
   info.scope = scope;
   info.name = ConvertJavaStringToUTF16(env, java_name);
@@ -89,11 +90,11 @@ static void UpdateAsync(
       static_cast<blink::WebScreenOrientationLockType>(java_orientation);
   info.theme_color = (long)java_theme_color;
   info.background_color = (long)java_background_color;
-  info.best_icon_url = best_icon_url;
+  info.best_primary_icon_url = best_primary_icon_url;
   info.manifest_url = web_manifest_url;
 
-  base::android::AppendJavaStringArrayToStringVector(
-      env, java_icon_urls.obj(), &info.icon_urls);
+  base::android::AppendJavaStringArrayToStringVector(env, java_icon_urls.obj(),
+                                                     &info.icon_urls);
 
   std::vector<std::string> icon_hashes;
   base::android::AppendJavaStringArrayToStringVector(
@@ -103,10 +104,10 @@ static void UpdateAsync(
   for (size_t i = 0; i < info.icon_urls.size(); ++i)
     icon_url_to_murmur2_hash[info.icon_urls[i]] = icon_hashes[i];
 
-  gfx::JavaBitmap java_bitmap_lock(java_best_icon_bitmap);
-  SkBitmap best_icon_bitmap =
+  gfx::JavaBitmap java_bitmap_lock(java_best_primary_icon_bitmap);
+  SkBitmap best_primary_icon_bitmap =
       gfx::CreateSkBitmapFromJavaBitmap(java_bitmap_lock);
-  best_icon_bitmap.setImmutable();
+  best_primary_icon_bitmap.setImmutable();
 
   std::string webapk_package;
   ConvertJavaStringToUTF8(env, java_webapk_package, &webapk_package);
@@ -119,7 +120,7 @@ static void UpdateAsync(
     return;
   }
   install_service->UpdateAsync(
-      info, best_icon_bitmap, webapk_package, java_webapk_version,
+      info, best_primary_icon_bitmap, webapk_package, java_webapk_version,
       icon_url_to_murmur2_hash, java_is_manifest_stale,
       base::Bind(&WebApkUpdateManager::OnBuiltWebApk, id));
 }