FaviconHandler test rewrite

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 <stddef.h>
 
 #include <map>
@@ skipping 113 matching lines @@
   virtual ~FaviconHandler();
 
   // Initiates loading the favicon for the specified url.
   void FetchFavicon(const GURL& url);
 
   // Message Handler.  Must be public, because also called from
   // PrerenderContents. Collects the |image_urls| list.
   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_;
   }
 
   // Returns whether the handler is waiting for a download to complete or for
   // data from the FaviconService. Reserved for testing.
   bool HasPendingTasksForTest();
 
  protected:
@@ skipping 22 matching lines @@
 
   virtual void SetHistoryFavicons(const GURL& page_url,
                                   const GURL& icon_url,
                                   favicon_base::IconType icon_type,
                                   const gfx::Image& image);
 
   // Returns true if the favicon should be saved.
   virtual bool ShouldSaveFavicon();
 
  private:
-  // For testing:
-  friend class TestFaviconHandler;
-
   // Represents an in progress download of an image from the renderer.
   struct DownloadRequest {
     DownloadRequest();
     ~DownloadRequest();
 
     DownloadRequest(const GURL& image_url, favicon_base::IconType icon_type);
 
     GURL image_url;
     favicon_base::IconType icon_type;
   };
@@ skipping 11 matching lines @@
     GURL image_url;
     gfx::Image image;
     float score;
     favicon_base::IconType icon_type;
   };
 
   // Returns the bit mask of favicon_base::IconType based on the handler's type.
   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();
 
   // See description above class for details.
   void OnFaviconDataForInitialURLFromFaviconService(const std::vector<
       favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
 
   // If the favicon currently mapped to |url_| has expired, downloads the
   // current candidate favicon from the renderer. Otherwise requests data for
@@ skipping 113 matching lines @@
   FaviconCandidate best_favicon_candidate_;
 
   base::WeakPtrFactory<FaviconHandler> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
 }  // namespace favicon
 
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_