1 files changed, 12 insertions, 5 deletions
diff --git a/components/favicon/core/favicon_handler.h b/components/favicon/core/favicon_handler.h
index c7181c5..9e59e00 100644
--- a/components/favicon/core/favicon_handler.h
+++ b/components/favicon/core/favicon_handler.h
@@ -19,15 +19,20 @@
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
-class FaviconClient;
-class FaviconDriver;
-class FaviconService;
+class FaviconTabHelperTest;
 class SkBitmap;
+class TestFaviconHandler;
 
 namespace base {
 class RefCountedMemory;
 }
 
+namespace favicon {
+
+class FaviconClient;
+class FaviconDriver;
+class FaviconService;
+
 // FaviconHandler works with FaviconDriver to fetch the specific type of
 // favicon.
 //
@@ -152,8 +157,8 @@ class FaviconHandler {
 
  private:
   // For testing:
-  friend class FaviconTabHelperTest;
-  friend class TestFaviconHandler;
+  friend class ::FaviconTabHelperTest;
+  friend class ::TestFaviconHandler;
 
   // Represents an in progress download of an image from the renderer.
   struct DownloadRequest {
@@ -312,4 +317,6 @@ class FaviconHandler {
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
+}  // namespace favicon
+
 #endif  // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_