Simplify FaviconDriverImpl by removing extra FaviconHandler member.

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 52 matching lines @@
 // . Otherwise we ask the history database to update the mapping from
 //   page url to favicon url and call us back with the favicon. Remember, it is
 //   possible for the db to already have the favicon, just not the mapping
 //   between page to favicon url. The callback for this is OnFaviconData.
 //
 // OnFaviconData either updates the favicon of the current page (if the
 // db knew about the favicon), or requests the renderer to download the
 // favicon.
 //
 // When the renderer downloads favicons, it considers the entire list of
 // favicon candidates, if |download_largest_favicon_| is true, the largest

[huangs, 2015/04/30 20:23:41]

Update name |download_largest_favicon_|

 // favicon will be used, otherwise the one that best matches the preferred size
 // is chosen (or the first one if there is no preferred  size). Once the
 // matching favicon has been determined, SetFavicon is called which updates
 // the page's favicon and notifies the database to save the favicon.
 
 class FaviconHandler {
  public:
   enum Type { FAVICON, TOUCH, LARGE };

[huangs, 2015/04/30 20:23:41]

Remove LARGE?

 
   FaviconHandler(FaviconService* service,
                  FaviconDriver* driver,
                  Type handler_type,
                  bool download_largest_icon);
   virtual ~FaviconHandler();
 
   // Returns the bit mask of favicon_base::IconType based on the handler's type.
   static int GetIconTypesFromHandlerType(Type icon_type);
 
@@ skipping 94 matching lines @@
 
     GURL url;
     GURL image_url;
     gfx::Image image;
     float score;
     favicon_base::IconType icon_type;
   };
 
   // Get the maximal icon size in pixels for a icon of type |icon_type| for the
   // current platform.
-  static int GetMaximalIconSize(favicon_base::IconType icon_type);
+  int GetMaximalIconSize(favicon_base::IconType icon_type);
 
   // See description above class for details.
   void OnFaviconDataForInitialURLFromFaviconService(const std::vector<
       favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
 
   // If the favicon has expired, asks the renderer to download the favicon.
   // Otherwise asks history to update the mapping between page url and icon
   // url with a callback to OnFaviconData when done.
   void DownloadFaviconOrAskFaviconService(const GURL& page_url,
                                           const GURL& icon_url,
@@ skipping 97 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_