Remove //components/favicon/core/browser

This adds unnecessary complexity since only //chrome/browser uses
the favicon components and there are no other sub-directories in
//components/favicon/core.

BUG=359513
TBR=sky@chromium.org
TBR=reed@google.com

Review URL: https://codereview.chromium.org/1021223002

Cr-Commit-Position: refs/heads/master@{#321556}

51 files changed, 83 insertions, 115 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index b3fe080..3a0ed2e 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -94,7 +94,7 @@ static_library("browser") {
     "//components/domain_reliability",
     "//components/enhanced_bookmarks",
     "//components/favicon_base",
-    "//components/favicon/core/browser",
+    "//components/favicon/core",
     "//components/gcm_driver",
     "//components/google/core/browser",
     "//components/handoff",
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
index a91271f..4df9a29 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/PartnerBookmarksReader_jni.h"
diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc
index 871977e..ddcacef 100644
--- a/chrome/browser/android/favicon_helper.cc
+++ b/chrome/browser/android/favicon_helper.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "jni/FaviconHelper_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/android/java_bitmap.h"
diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc
index d07a08d..8ee893b 100644
--- a/chrome/browser/android/provider/chrome_browser_provider.cc
+++ b/chrome/browser/android/provider/chrome_browser_provider.cc
@@ -32,7 +32,7 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/android/android_history_types.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/top_sites.h"
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index f1f0bf8..70cf788 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -23,7 +23,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/web_application_info.h"
 #include "components/dom_distiller/core/url_utils.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_android.h
index 9ee1255..0de4f1f 100644
--- a/chrome/browser/android/tab_android.h
+++ b/chrome/browser/android/tab_android.h
@@ -16,7 +16,7 @@
 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
-#include "components/favicon/core/browser/favicon_tab_helper_observer.h"
+#include "components/favicon/core/favicon_tab_helper_observer.h"
 #include "components/sessions/session_id.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 73fcf38..c5e30e8 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "components/bookmarks/browser/bookmark_codec.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index d4203a1..362b098 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -20,7 +20,7 @@
 #include "chrome/utility/importer/bookmark_html_reader.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
index 3f5fa30..b319648 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
@@ -16,7 +16,7 @@
 #include "components/bookmarks/browser/bookmark_node.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/url_database.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index 5d63af5..9402ada 100644
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -23,7 +23,7 @@
 #include "chrome/common/extensions/extension_metrics.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/web_application_info.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index bd7d06b..4d06efc 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -19,7 +19,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/navigation_controller.h"
diff --git a/chrome/browser/favicon/chrome_favicon_client.h b/chrome/browser/favicon/chrome_favicon_client.h
index 6d42bfc..e8251f0 100644
--- a/chrome/browser/favicon/chrome_favicon_client.h
+++ b/chrome/browser/favicon/chrome_favicon_client.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_FAVICON_CHROME_FAVICON_CLIENT_H_
 
 #include "base/macros.h"
-#include "components/favicon/core/browser/favicon_client.h"
+#include "components/favicon/core/favicon_client.h"
 
 class GURL;
 class Profile;
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
index 6074c04..4e4dd4c 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/favicon/core/browser/favicon_handler.h"
+#include "components/favicon/core/favicon_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
@@ -12,7 +12,7 @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
diff --git a/chrome/browser/favicon/favicon_service_factory.cc b/chrome/browser/favicon/favicon_service_factory.cc
index 10814b3..1fe2f8b 100644
--- a/chrome/browser/favicon/favicon_service_factory.cc
+++ b/chrome/browser/favicon/favicon_service_factory.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc
index a6a2d74..2625ee7 100644
--- a/chrome/browser/favicon/favicon_tab_helper.cc
+++ b/chrome/browser/favicon/favicon_tab_helper.cc
@@ -15,9 +15,9 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon/core/browser/favicon_handler.h"
-#include "components/favicon/core/browser/favicon_service.h"
-#include "components/favicon/core/browser/favicon_tab_helper_observer.h"
+#include "components/favicon/core/favicon_handler.h"
+#include "components/favicon/core/favicon_service.h"
+#include "components/favicon/core/favicon_tab_helper_observer.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/favicon_status.h"
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
index 6ee0221..b916d6d 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/observer_list.h"
-#include "components/favicon/core/browser/favicon_client.h"
+#include "components/favicon/core/favicon_client.h"
 #include "components/favicon/core/favicon_driver.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/favicon/favicon_tab_helper_browsertest.cc b/chrome/browser/favicon/favicon_tab_helper_browsertest.cc
index 81bd226..2fc363a 100644
--- a/chrome/browser/favicon/favicon_tab_helper_browsertest.cc
+++ b/chrome/browser/favicon/favicon_tab_helper_browsertest.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/favicon/core/browser/favicon_handler.h"
+#include "components/favicon/core/favicon_handler.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
diff --git a/chrome/browser/history/android/DEPS b/chrome/browser/history/android/DEPS
index 8fdbf32..b590a3f 100644
--- a/chrome/browser/history/android/DEPS
+++ b/chrome/browser/history/android/DEPS
@@ -3,6 +3,6 @@ include_rules = [
   # chrome/browser/history, so it is allowed to use chrome/browser and
   # components/.
   "+chrome/browser",
-  "+components/bookmarks/browser",
-  "+components/favicon/core/browser",
+  "+components/bookmarks",
+  "+components/favicon",
 ]
diff --git a/chrome/browser/history/android/android_history_provider_service.cc b/chrome/browser/history/android/android_history_provider_service.cc
index 722d4e5..2c897dc 100644
--- a/chrome/browser/history/android/android_history_provider_service.cc
+++ b/chrome/browser/history/android/android_history_provider_service.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/history/android/android_provider_backend.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/android/android_history_types.h"
 #include "components/history/core/browser/history_backend.h"
 #include "components/history/core/browser/history_db_task.h"
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index 4a46de4..dce7690 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -25,7 +25,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/bookmarks/browser/bookmark_model.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/search_engines/template_url.h"
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc
index 7745f07..3eb22ce 100644
--- a/chrome/browser/jumplist_win.cc
+++ b/chrome/browser/jumplist_win.cc
@@ -26,7 +26,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/page_usage_data.h"
diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc
index d16c618f..1405326 100644
--- a/chrome/browser/notifications/message_center_settings_controller.cc
+++ b/chrome/browser/notifications/message_center_settings_controller.cc
@@ -24,7 +24,7 @@
 #include "chrome/common/extensions/api/notifications.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/history/core/browser/history_types.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index cc6340f..ac57fcd 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -24,7 +24,7 @@
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/internal_api/public/change_record.h"
diff --git a/chrome/browser/sync/glue/favicon_cache.cc b/chrome/browser/sync/glue/favicon_cache.cc
index 1237a95..f722fbc 100644
--- a/chrome/browser/sync/glue/favicon_cache.cc
+++ b/chrome/browser/sync/glue/favicon_cache.cc
@@ -8,7 +8,7 @@
 #include "base/metrics/histogram.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "sync/api/time.h"
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index c51e926..7bf293e 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -34,7 +34,7 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc
index f7369c5..a48c421 100644
--- a/chrome/browser/ui/android/navigation_popup.cc
+++ b/chrome/browser/ui/android/navigation_popup.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "jni/NavigationPopup_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc b/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc
index 18515bb..fbf7cbf 100644
--- a/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc
+++ b/chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/suggestions/proto/suggestions.pb.h"
 #include "components/suggestions/suggestions_service.h"
 #include "components/suggestions/suggestions_utils.h"
diff --git a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc
index 6535b14..8586261 100644
--- a/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc
+++ b/chrome/browser/ui/app_list/search/suggestions/url_suggestion_result.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/search/search_util.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/suggestions/suggestions_service.h"
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h
index 1f9cc2d..8cbdace 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.h
@@ -16,7 +16,7 @@
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #import "chrome/browser/ui/cocoa/main_menu_item.h"
-#import "components/favicon/core/browser/favicon_service.h"
+#import "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_service_observer.h"
 #include "components/sessions/session_id.h"
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc
index f0799d5..db5a01a 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -8,7 +8,7 @@
 #include "base/i18n/rtl.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h
index 60265bba..5036ac8 100644
--- a/chrome/browser/ui/toolbar/back_forward_menu_model.h
+++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h
@@ -12,7 +12,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/strings/string16.h"
 #include "base/task/cancelable_task_tracker.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/window_open_disposition.h"
 
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
index 17d2818..9fa270c 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/sync/glue/synced_session.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/models/simple_menu_model.h"
 
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 597d766..18ea11e 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -60,7 +60,7 @@
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/dom_distiller/webui/dom_distiller_ui.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "components/history/core/browser/history_types.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.h b/chrome/browser/ui/webui/extensions/extension_icon_source.h
index 5f25cbc..ca50b4e 100644
--- a/chrome/browser/ui/webui/extensions/extension_icon_source.h
+++ b/chrome/browser/ui/webui/extensions/extension_icon_source.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "content/public/browser/url_data_source.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_resource.h"
diff --git a/chrome/browser/ui/webui/favicon_source.h b/chrome/browser/ui/webui/favicon_source.h
index ef4df8d..2c2285e 100644
--- a/chrome/browser/ui/webui/favicon_source.h
+++ b/chrome/browser/ui/webui/favicon_source.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "content/public/browser/url_data_source.h"
 #include "ui/gfx/favicon_size.h"
 
diff --git a/chrome/browser/ui/webui/large_icon_source.cc b/chrome/browser/ui/webui/large_icon_source.cc
index 0dc7cd6..4dc270e 100644
--- a/chrome/browser/ui/webui/large_icon_source.cc
+++ b/chrome/browser/ui/webui/large_icon_source.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/common/favicon/large_icon_url_parser.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/fallback_icon_style.h"
 #include "grit/platform_locale_settings.h"
 #include "net/url_request/url_request.h"
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index daf392b..0e31f88 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -15,7 +15,7 @@
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
index 2a99911..28e2eb1 100644
--- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
+++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/top_sites.h"
 #include "content/public/browser/web_ui.h"
 #include "extensions/browser/extension_registry.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 370b32a..e15f201 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2922,7 +2922,7 @@
         '../components/components.gyp:domain_reliability',
         '../components/components.gyp:enhanced_bookmarks',
         '../components/components.gyp:favicon_base',
-        '../components/components.gyp:favicon_core_browser',
+        '../components/components.gyp:favicon_core',
         '../components/components.gyp:gcm_driver',
         '../components/components.gyp:google_core_browser',
         '../components/components.gyp:handoff',
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 3a7dfda..004a73c 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -54,7 +54,7 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/common/bookmark_constants.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/history/content/browser/content_visit_delegate.h"
 #include "components/history/content/browser/history_database_helper.h"
 #include "components/history/core/browser/history_backend.h"
diff --git a/components/BUILD.gn b/components/BUILD.gn
index b191f5e..88c872a 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -39,7 +39,7 @@ group("all_components") {
     "//components/dom_distiller/core",
     "//components/domain_reliability",
     "//components/enhanced_bookmarks",
-    "//components/favicon/core/browser",
+    "//components/favicon/core",
     "//components/favicon_base",
     "//components/feedback",
     "//components/gcm_driver",
@@ -163,7 +163,7 @@ group("all_components") {
       "//components/data_reduction_proxy/core/common",  # Should work, needs checking.
       "//components/dom_distiller/core",  # Blocked on content.
       "//components/domain_reliability",  # Blocked on content.
-      "//components/favicon/core/browser",  # Blocked on keyed service.
+      "//components/favicon/core",  # Blocked on keyed service.
       "//components/favicon_base",  # Should work, needs checking.
       "//components/feedback",  # Blocked on content.
       "//components/gcm_driver",  # Should work, needs checking.
diff --git a/components/favicon.gypi b/components/favicon.gypi
index 09a78f2..d5b3e9c 100644
--- a/components/favicon.gypi
+++ b/components/favicon.gypi
@@ -9,42 +9,25 @@
       'target_name': 'favicon_core',
       'type': 'static_library',
       'dependencies': [
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../url/url.gyp:url_lib',
-        'favicon_base',
-      ],
-      'sources': [
-        # Note: sources list duplicated in GN build.
-        'favicon/core/favicon_driver.h',
-        'favicon/core/favicon_url.cc',
-        'favicon/core/favicon_url.h',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-    },
-    {
-      # GN version: //components/favicon/core/browser
-      'target_name': 'favicon_core_browser',
-      'type': 'static_library',
-      'dependencies': [
         '../skia/skia.gyp:skia',
         '../ui/gfx/gfx.gyp:gfx',
         '../url/url.gyp:url_lib',
         'bookmarks_browser',
         'favicon_base',
-        'favicon_core',
         'history_core_browser',
         'keyed_service_core',
       ],
       'sources': [
         # Note: sources list duplicated in GN build.
-        'favicon/core/browser/favicon_client.h',
-        'favicon/core/browser/favicon_handler.cc',
-        'favicon/core/browser/favicon_handler.h',
-        'favicon/core/browser/favicon_service.cc',
-        'favicon/core/browser/favicon_service.h',
-        'favicon/core/browser/favicon_tab_helper_observer.h',
+        'favicon/core/favicon_client.h',
+        'favicon/core/favicon_driver.h',
+        'favicon/core/favicon_handler.cc',
+        'favicon/core/favicon_handler.h',
+        'favicon/core/favicon_service.cc',
+        'favicon/core/favicon_service.h',
+        'favicon/core/favicon_tab_helper_observer.h',
+        'favicon/core/favicon_url.cc',
+        'favicon/core/favicon_url.h',
       ],
       'include_dirs': [
         '..',
diff --git a/components/favicon/core/BUILD.gn b/components/favicon/core/BUILD.gn
index 05bd40b..f7ffefa 100644
--- a/components/favicon/core/BUILD.gn
+++ b/components/favicon/core/BUILD.gn
@@ -4,14 +4,24 @@
 
 static_library("core") {
   sources = [
+    "favicon_client.h",
     "favicon_driver.h",
+    "favicon_handler.cc",
+    "favicon_handler.h",
+    "favicon_service.cc",
+    "favicon_service.h",
+    "favicon_tab_helper_observer.h",
     "favicon_url.cc",
     "favicon_url.h",
   ]
 
   deps = [
+    "//components/bookmarks/browser",
     "//components/favicon_base",
-    "//ui/gfx/geometry",
+    "//components/history/core/browser",
+    "//components/keyed_service/core",
+    "//skia",
+    "//ui/gfx",
     "//url",
   ]
 }
diff --git a/components/favicon/core/browser/DEPS b/components/favicon/core/DEPS
index 8a86e5b..8a86e5b 100644
--- a/components/favicon/core/browser/DEPS
+++ b/components/favicon/core/DEPS
diff --git a/components/favicon/core/browser/BUILD.gn b/components/favicon/core/browser/BUILD.gn
deleted file mode 100644
index 22e1246..0000000
--- a/components/favicon/core/browser/BUILD.gn
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2015 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.
-
-static_library("browser") {
-  sources = [
-    "favicon_client.h",
-    "favicon_handler.cc",
-    "favicon_handler.h",
-    "favicon_service.cc",
-    "favicon_service.h",
-    "favicon_tab_helper_observer.h",
-  ]
-
-  deps = [
-    "//components/bookmarks/browser",
-    "//components/favicon/core",
-    "//components/favicon_base",
-    "//components/history/core/browser",
-    "//components/keyed_service/core",
-    "//skia",
-    "//ui/gfx",
-    "//url",
-  ]
-}
diff --git a/components/favicon/core/browser/favicon_client.h b/components/favicon/core/favicon_client.h
index 71cdbb5..913485e 100644
--- a/components/favicon/core/browser/favicon_client.h
+++ b/components/favicon/core/favicon_client.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_CORE_BROWSER_FAVICON_CLIENT_H_
-#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_CLIENT_H_
+#ifndef COMPONENTS_FAVICON_CORE_FAVICON_CLIENT_H_
+#define COMPONENTS_FAVICON_CORE_FAVICON_CLIENT_H_
 
 #include <vector>
 
@@ -44,4 +44,4 @@ class FaviconClient : public KeyedService {
   DISALLOW_COPY_AND_ASSIGN(FaviconClient);
 };
 
-#endif  // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_CLIENT_H_
+#endif  // COMPONENTS_FAVICON_CORE_FAVICON_CLIENT_H_
diff --git a/components/favicon/core/browser/favicon_handler.cc b/components/favicon/core/favicon_handler.cc
index 6659779..641b0f1 100644
--- a/components/favicon/core/browser/favicon_handler.cc
+++ b/components/favicon/core/favicon_handler.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/favicon/core/browser/favicon_handler.h"
+#include "components/favicon/core/favicon_handler.h"
 
 #include <algorithm>
 #include <cmath>
@@ -12,9 +12,9 @@
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "build/build_config.h"
-#include "components/favicon/core/browser/favicon_client.h"
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_client.h"
 #include "components/favicon/core/favicon_driver.h"
+#include "components/favicon/core/favicon_service.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "skia/ext/image_operations.h"
diff --git a/components/favicon/core/browser/favicon_handler.h b/components/favicon/core/favicon_handler.h
index 90cd152..c7181c5 100644
--- a/components/favicon/core/browser/favicon_handler.h
+++ b/components/favicon/core/favicon_handler.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_CORE_BROWSER_FAVICON_HANDLER_H_
-#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_
+#ifndef COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
+#define COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
 
 #include <deque>
 #include <map>
@@ -312,4 +312,4 @@ class FaviconHandler {
   DISALLOW_COPY_AND_ASSIGN(FaviconHandler);
 };
 
-#endif  // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_HANDLER_H_
+#endif  // COMPONENTS_FAVICON_CORE_FAVICON_HANDLER_H_
diff --git a/components/favicon/core/browser/favicon_service.cc b/components/favicon/core/favicon_service.cc
index f0173e4..b455f1e 100644
--- a/components/favicon/core/browser/favicon_service.cc
+++ b/components/favicon/core/favicon_service.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/favicon/core/browser/favicon_service.h"
+#include "components/favicon/core/favicon_service.h"
 
 #include <cmath>
 
 #include "base/hash.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/favicon/core/browser/favicon_client.h"
+#include "components/favicon/core/favicon_client.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "components/history/core/browser/history_service.h"
diff --git a/components/favicon/core/browser/favicon_service.h b/components/favicon/core/favicon_service.h
index 4149344..9e45c55 100644
--- a/components/favicon/core/browser/favicon_service.h
+++ b/components/favicon/core/favicon_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_CORE_BROWSER_FAVICON_SERVICE_H_
-#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_SERVICE_H_
+#ifndef COMPONENTS_FAVICON_CORE_FAVICON_SERVICE_H_
+#define COMPONENTS_FAVICON_CORE_FAVICON_SERVICE_H_
 
 #include <vector>
 
@@ -251,4 +251,4 @@ class FaviconService : public KeyedService {
   DISALLOW_COPY_AND_ASSIGN(FaviconService);
 };
 
-#endif  // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_SERVICE_H_
+#endif  // COMPONENTS_FAVICON_CORE_FAVICON_SERVICE_H_
diff --git a/components/favicon/core/browser/favicon_tab_helper_observer.h b/components/favicon/core/favicon_tab_helper_observer.h
index bc109ff..bf8a053 100644
--- a/components/favicon/core/browser/favicon_tab_helper_observer.h
+++ b/components/favicon/core/favicon_tab_helper_observer.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_CORE_BROWSER_FAVICON_TAB_HELPER_OBSERVER_H_
-#define COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_TAB_HELPER_OBSERVER_H_
+#ifndef COMPONENTS_FAVICON_CORE_FAVICON_TAB_HELPER_OBSERVER_H_
+#define COMPONENTS_FAVICON_CORE_FAVICON_TAB_HELPER_OBSERVER_H_
 
 namespace gfx {
 class Image;
@@ -21,4 +21,4 @@ class FaviconTabHelperObserver {
   virtual ~FaviconTabHelperObserver() {}
 };
 
-#endif  // COMPONENTS_FAVICON_CORE_BROWSER_FAVICON_TAB_HELPER_OBSERVER_H_
+#endif  // COMPONENTS_FAVICON_CORE_FAVICON_TAB_HELPER_OBSERVER_H_