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

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 144 matching lines @@
 }
 
 bool AddToHomescreenDataFetcher::OnMessageReceived(
     const IPC::Message& message) {
   if (!is_waiting_for_web_application_info_)
     return false;
 
   bool handled = true;
 
   IPC_BEGIN_MESSAGE_MAP(AddToHomescreenDataFetcher, message)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidGetWebApplicationInfo,
-                        OnDidGetWebApplicationInfo)
-    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_DidGetWebApplicationInfo,

[dominickn, 2017/02/02 23:34:13]

The standard Chromium style is to have IPC_MESSAGE_HANDLER be indented two
spaces. Please restore (did you run clang-format on this CL? Did it do this?)

[F, 2017/02/03 00:47:15]

Running clang-format restored the old formatting. I have no idea what
happened...

+                      OnDidGetWebApplicationInfo)
+  IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
 void AddToHomescreenDataFetcher::OnDataTimedout() {
   if (!web_contents() || !weak_observer_)
     return;
 
   if (!is_installable_check_complete_) {
@@ skipping 35 matching lines @@
 
   // 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_,
       content::Manifest::Icon::IconPurpose::ANY);
 
   weak_observer_->OnUserTitleAvailable(shortcut_info_.user_title);
 
   if (data.primary_icon) {
-    shortcut_info_.best_icon_url = data.primary_icon_url;
+    shortcut_info_.best_primary_icon_url = data.primary_icon_url;
 
     CreateLauncherIcon(*(data.primary_icon));
     return;
   }
 
   FetchFavicon();
 }
 
 void AddToHomescreenDataFetcher::FetchFavicon() {
   if (!web_contents() || !weak_observer_)
@@ skipping 35 matching lines @@
 void AddToHomescreenDataFetcher::CreateLauncherIconFromFaviconInBackground(
     const favicon_base::FaviconRawBitmapResult& bitmap_result) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   SkBitmap raw_icon;
   if (bitmap_result.is_valid()) {
     gfx::PNGCodec::Decode(bitmap_result.bitmap_data->front(),
                           bitmap_result.bitmap_data->size(), &raw_icon);
   }
 
-  shortcut_info_.best_icon_url = bitmap_result.icon_url;
+  shortcut_info_.best_primary_icon_url = bitmap_result.icon_url;
   CreateLauncherIconInBackground(raw_icon);
 }
 
 void AddToHomescreenDataFetcher::CreateLauncherIcon(const SkBitmap& raw_icon) {
-    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-    content::BrowserThread::GetBlockingPool()
-        ->PostWorkerTaskWithShutdownBehavior(
-            FROM_HERE,
-            base::Bind(
-                &AddToHomescreenDataFetcher::CreateLauncherIconInBackground,
-                this, raw_icon),
-            base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  content::BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
+      FROM_HERE,
+      base::Bind(&AddToHomescreenDataFetcher::CreateLauncherIconInBackground,
+                 this, raw_icon),
+      base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 }
 
 void AddToHomescreenDataFetcher::CreateLauncherIconInBackground(
     const SkBitmap& raw_icon) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
 
   SkBitmap icon;
   bool is_generated = false;
   if (weak_observer_) {
     icon = weak_observer_->FinalizeLauncherIconInBackground(
         raw_icon, shortcut_info_.url, &is_generated);
   }
 
   if (is_generated)
-    shortcut_info_.best_icon_url = GURL();
+    shortcut_info_.best_primary_icon_url = GURL();
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&AddToHomescreenDataFetcher::NotifyObserver, this, icon));
 }
 
 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_);
 }