[Icons NTP] Refactoring: Moving FallbackIconService to components\favicon\core

components/favicon/core/fallback_icon_service.h

Index: components/favicon/core/fallback_icon_service.h
diff --git a/components/favicon_base/fallback_icon_service.h b/components/favicon/core/fallback_icon_service.h
similarity index 78%
rename from components/favicon_base/fallback_icon_service.h
rename to components/favicon/core/fallback_icon_service.h
index cc98adfe20feb677029bfa6c6cd3b010f38045c3..9b3f6ba10a028a1669daf0a14ea1a90c9d6a7937 100644
--- a/components/favicon_base/fallback_icon_service.h
+++ b/components/favicon/core/fallback_icon_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_FAVICON_BASE_FALLBACK_ICON_SERVICE_H_
-#define COMPONENTS_FAVICON_BASE_FALLBACK_ICON_SERVICE_H_
+#ifndef COMPONENTS_FAVICON_CORE_FALLBACK_ICON_SERVICE_H_
+#define COMPONENTS_FAVICON_CORE_FALLBACK_ICON_SERVICE_H_
 
 #include <string>
 #include <vector>
@@ -17,8 +17,8 @@ class Canvas;
 }
 
 namespace favicon_base {
-
 struct FallbackIconStyle;
+}
 
 // A service to provide methods to render fallback favicons.
 class FallbackIconService {
@@ -31,14 +31,14 @@ class FallbackIconService {
   std::vector<unsigned char> RenderFallbackIconBitmap(
       const GURL& icon_url,
       int size,
-      const FallbackIconStyle& style);
+      const favicon_base::FallbackIconStyle& style);
 
  private:
   // Renders a fallback icon on |canvas| at position (|x|, |y|). |size| is icon
   // width and height in pixels.
   void DrawFallbackIcon(const GURL& icon_url,
                         int size,
-                        const FallbackIconStyle& style,
+                        const favicon_base::FallbackIconStyle& style,
                         gfx::Canvas* canvas);
 
   std::vector<std::string> font_list_;
@@ -46,6 +46,4 @@ class FallbackIconService {
   DISALLOW_COPY_AND_ASSIGN(FallbackIconService);
 };
 
-}  // namespace favicon_base
-
-#endif  // COMPONENTS_FAVICON_BASE_FALLBACK_ICON_SERVICE_H_
+#endif  // COMPONENTS_FAVICON_CORE_FALLBACK_ICON_SERVICE_H_