Componentize FaviconTabHelper

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 960eba5136c46ac3d052f173e831aa42a318d124..d8fee10bf7b78767abe76b5fae2ea0d7cf16998a 100644
--- a/components/favicon/core/favicon_handler.h
+++ b/components/favicon/core/favicon_handler.h
@@ -19,7 +19,6 @@
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
-class FaviconTabHelperTest;
 class SkBitmap;
 class TestFaviconHandler;
 
@@ -118,6 +117,10 @@ class FaviconHandler {
     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:
   // These virtual methods make FaviconHandler testable and are overridden by
   // TestFaviconHandler.
@@ -155,7 +158,6 @@ class FaviconHandler {
 
  private:
   // For testing:
-  friend class ::FaviconTabHelperTest;
   friend class ::TestFaviconHandler;
 
   // Represents an in progress download of an image from the renderer.