Make logic in OnFaviconDataForInitialURLFromFaviconService() the same for touch & non-touch favicons

components/favicon/core/favicon_handler.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 #define COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 254 matching lines @@
   // Whether we got data back for the initial request to the FaviconService.
   bool got_favicon_from_history_;
 
   // Whether the history data returned in
   // OnFaviconDataForInitialURLFromFaviconService() is out of date or is known
   // to be incomplete. If true, it means there is a favicon mapped to |url_| in
   // history, but we need to redownload the icon URLs because the icon in the
   // database has expired or the data in the database is incomplete.
   bool initial_history_result_expired_or_incomplete_;
 
+  // Whether FaviconHandler should ignore history state and determine the
+  // optimal icon URL out of |image_urls_| for |url_| by downloading
+  // |image_urls_| one by one.
+  bool redownload_icons_;
+
   // Requests to the renderer to download favicons.
   typedef std::map<int, DownloadRequest> DownloadRequests;
   DownloadRequests download_requests_;
 
   // The combination of the supported icon types.
   const int icon_types_;
 
   // Whether the largest icon should be downloaded.
   const bool download_largest_icon_;
 
@@ skipping 21 matching lines @@
   // available the favicon service and the current page are updated (assuming
   // the image is for a favicon).
   FaviconCandidate best_favicon_candidate_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_