FaviconHandler test rewrite

components/favicon/core/favicon_handler.h

Index: components/favicon/core/favicon_handler.h
diff --git a/components/favicon/core/favicon_handler.h b/components/favicon/core/favicon_handler.h
index e7a13bbb8d08a03166d910ab0330d170854c488b..9813d9f3c377898da4585a4508e12e13d88cd704 100644
--- a/components/favicon/core/favicon_handler.h
+++ b/components/favicon/core/favicon_handler.h
@@ -131,6 +131,10 @@ class FaviconHandler {
   void OnUpdateFaviconURL(const GURL& page_url,
                           const std::vector<favicon::FaviconURL>& candidates);
 
+  // Get the maximal icon size in pixels for a icon of type |icon_type| for the
+  // current platform. Public for testing.
+  static int GetMaximalIconSize(favicon_base::IconType icon_type);
+
   // For testing.
   const std::vector<favicon::FaviconURL>& image_urls() const {
     return image_urls_;
@@ -173,9 +177,6 @@ class FaviconHandler {
   virtual bool ShouldSaveFavicon();
 
  private:
-  // For testing:
-  friend class TestFaviconHandler;
-
   // Represents an in progress download of an image from the renderer.
   struct DownloadRequest {
     DownloadRequest();
@@ -207,10 +208,6 @@ class FaviconHandler {
   static int GetIconTypesFromHandlerType(
       FaviconDriverObserver::NotificationIconType handler_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);
-
   // Called when the history request for favicon data mapped to |url_| has
   // completed and the renderer has told us the icon URLs used by |url_|
   void OnGotInitialHistoryDataAndIconURLCandidates();