Move ImportedFaviconUsage to favicons_base component.

ImportedFaviconUsage is part of importer.
Rename it to FaviconUsageData and move it to favicons_base.

BUG=453952

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

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

16 files changed, 30 insertions, 35 deletions

diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index ebd6cf0..11eb1ed 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -17,12 +17,12 @@
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/test/base/testing_profile.h"
 #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_base/favicon_usage_data.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "grit/components_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -245,7 +245,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) {
   // Read the bookmarks back in.
   std::vector<ImportedBookmarkEntry> parsed_bookmarks;
   std::vector<importer::SearchEngineInfo> parsed_search_engines;
-  std::vector<ImportedFaviconUsage> favicons;
+  favicon_base::FaviconUsageDataList favicons;
   bookmark_html_reader::ImportBookmarksFile(base::Callback<bool(void)>(),
                                             base::Callback<bool(const GURL&)>(),
                                             path_,
diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc
index 207703c..2bbdadb 100644
--- a/chrome/browser/favicon/favicon_service.cc
+++ b/chrome/browser/favicon/favicon_service.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/url_constants.h"
 #include "components/favicon_base/favicon_util.h"
 #include "components/favicon_base/select_favicon_frames.h"
@@ -284,7 +283,7 @@ void FaviconService::CloneFavicon(const GURL& old_page_url,
 }
 
 void FaviconService::SetImportedFavicons(
-    const std::vector<ImportedFaviconUsage>& favicon_usage) {
+    const favicon_base::FaviconUsageDataList& favicon_usage) {
   if (history_service_)
     history_service_->SetImportedFavicons(favicon_usage);
 }
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 06c1a66..b1c32a3 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -13,12 +13,12 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "components/favicon_base/favicon_callback.h"
 #include "components/favicon_base/favicon_types.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 class FaviconClient;
 class GURL;
 class HistoryService;
-struct ImportedFaviconUsage;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
@@ -177,7 +177,7 @@ class FaviconService : public KeyedService {
   // must exist, any favicon sets for unknown pages will be discarded. Existing
   // favicons will not be overwritten.
   void SetImportedFavicons(
-      const std::vector<ImportedFaviconUsage>& favicon_usage);
+      const favicon_base::FaviconUsageDataList& favicon_usage);
 
   // Set the favicon for |page_url| for |icon_type| in the thumbnail database.
   // Unlike SetFavicons(), this method will not delete preexisting bitmap data
diff --git a/chrome/browser/history/history_backend.cc b/chrome/browser/history/history_backend.cc
index 778db4f..26c7133 100644
--- a/chrome/browser/history/history_backend.cc
+++ b/chrome/browser/history/history_backend.cc
@@ -25,7 +25,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/download_row.h"
@@ -1812,7 +1811,7 @@ void HistoryBackend::CloneFavicons(const GURL& old_page_url,
 }
 
 void HistoryBackend::SetImportedFavicons(
-    const std::vector<ImportedFaviconUsage>& favicon_usage) {
+    const favicon_base::FaviconUsageDataList& favicon_usage) {
   if (!db_ || !thumbnail_db_)
     return;
 
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 3af0a5a..0dc68f8 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -18,6 +18,7 @@
 #include "base/observer_list.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task/cancelable_task_tracker.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/expire_history_backend.h"
 #include "components/history/core/browser/history_backend_notifier.h"
 #include "components/history/core/browser/history_types.h"
@@ -33,7 +34,6 @@
 
 class HistoryURLProvider;
 struct HistoryURLProviderParams;
-struct ImportedFaviconUsage;
 class SkBitmap;
 class TestingProfile;
 struct ThumbnailScore;
@@ -311,7 +311,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   void CloneFavicons(const GURL& old_page_url, const GURL& new_page_url);
 
   void SetImportedFavicons(
-      const std::vector<ImportedFaviconUsage>& favicon_usage);
+      const favicon_base::FaviconUsageDataList& favicon_usage);
 
   // Downloads -----------------------------------------------------------------
 
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index e78998d..6f3a46d 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -27,9 +27,9 @@
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/history_constants.h"
 #include "components/history/core/browser/history_database_params.h"
 #include "components/history/core/browser/history_service_observer.h"
@@ -1133,8 +1133,8 @@ TEST_F(HistoryBackendTest, ImportedFaviconsTest) {
   // Now provide one imported favicon for both URLs already in the registry.
   // The new favicon should only be used with the URL that doesn't already have
   // a favicon.
-  std::vector<ImportedFaviconUsage> favicons;
-  ImportedFaviconUsage favicon;
+  favicon_base::FaviconUsageDataList favicons;
+  favicon_base::FaviconUsageData favicon;
   favicon.favicon_url = GURL("http://news.google.com/favicon.ico");
   favicon.png_data.push_back('2');
   favicon.urls.insert(row1.url());
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 306408c..1216d95 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -33,7 +33,6 @@
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/web_history_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/url_constants.h"
 #include "components/dom_distiller/core/url_constants.h"
 #include "components/history/core/browser/download_row.h"
@@ -688,7 +687,7 @@ void HistoryService::CloneFavicons(const GURL& old_page_url,
 }
 
 void HistoryService::SetImportedFavicons(
-    const std::vector<ImportedFaviconUsage>& favicon_usage) {
+    const favicon_base::FaviconUsageDataList& favicon_usage) {
   DCHECK(thread_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());
   ScheduleTask(PRIORITY_NORMAL,
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 23c8e4b..50963ac 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -26,6 +26,7 @@
 #include "chrome/browser/history/delete_directive_handler.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "components/favicon_base/favicon_callback.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/history_client.h"
 #include "components/history/core/browser/keyword_id.h"
 #include "components/keyed_service/core/keyed_service.h"
@@ -40,7 +41,6 @@ class AndroidHistoryProviderService;
 
 class GURL;
 class HistoryService;
-struct ImportedFaviconUsage;
 class PageUsageRequest;
 class Profile;
 class SkBitmap;
@@ -779,7 +779,7 @@ class HistoryService : public syncer::SyncableService,
   // once. The pages must exist, any favicon sets for unknown pages will be
   // discarded. Existing favicons will not be overwritten.
   void SetImportedFavicons(
-      const std::vector<ImportedFaviconUsage>& favicon_usage);
+      const favicon_base::FaviconUsageDataList& favicon_usage);
 
   // Sets the in-memory URL database. This is called by the backend once the
   // database is loaded to make it available.
diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc
index 116c72f..384f78e 100644
--- a/chrome/browser/importer/external_process_importer_client.cc
+++ b/chrome/browser/importer/external_process_importer_client.cc
@@ -221,7 +221,7 @@ void ExternalProcessImporterClient::OnFaviconsImportStart(
 }
 
 void ExternalProcessImporterClient::OnFaviconsImportGroup(
-    const std::vector<ImportedFaviconUsage>& favicons_group) {
+    const favicon_base::FaviconUsageDataList& favicons_group) {
   if (cancelled_)
     return;
 
diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h
index feca90f..e5a0aa1 100644
--- a/chrome/browser/importer/external_process_importer_client.h
+++ b/chrome/browser/importer/external_process_importer_client.h
@@ -15,13 +15,13 @@
 #include "chrome/common/importer/importer_autofill_form_data_entry.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/common/importer/importer_url_row.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/history_types.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host_client.h"
 
 class ExternalProcessImporterHost;
 struct ImportedBookmarkEntry;
-struct ImportedFaviconUsage;
 class InProcessImporterBridge;
 
 namespace autofill {
@@ -77,7 +77,7 @@ class ExternalProcessImporterClient : public content::UtilityProcessHostClient {
       const std::vector<ImportedBookmarkEntry>& bookmarks_group);
   void OnFaviconsImportStart(size_t total_favicons_count);
   void OnFaviconsImportGroup(
-      const std::vector<ImportedFaviconUsage>& favicons_group);
+      const favicon_base::FaviconUsageDataList& favicons_group);
   void OnPasswordFormImportReady(const autofill::PasswordForm& form);
   void OnKeywordsImportReady(
       const std::vector<importer::SearchEngineInfo>& search_engines,
@@ -113,7 +113,7 @@ class ExternalProcessImporterClient : public content::UtilityProcessHostClient {
   // entire group has been collected and is ready to be written to the profile.
   std::vector<ImporterURLRow> history_rows_;
   std::vector<ImportedBookmarkEntry> bookmarks_;
-  std::vector<ImportedFaviconUsage> favicons_;
+  favicon_base::FaviconUsageDataList favicons_;
   std::vector<ImporterAutofillFormDataEntry> autofill_form_data_;
 
   // Usually some variation on IDS_BOOKMARK_GROUP_...; the name of the folder
diff --git a/chrome/browser/importer/firefox_importer_browsertest.cc b/chrome/browser/importer/firefox_importer_browsertest.cc
index 2044a52..536421e 100644
--- a/chrome/browser/importer/firefox_importer_browsertest.cc
+++ b/chrome/browser/importer/firefox_importer_browsertest.cc
@@ -17,11 +17,11 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/common/password_form.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/search_engines/template_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -236,8 +236,8 @@ class FirefoxObserver : public ProfileWriter,
     }
   }
 
-  void AddFavicons(const std::vector<ImportedFaviconUsage>& favicons) override {
-  }
+  void AddFavicons(
+      const favicon_base::FaviconUsageDataList& favicons) override {}
 
  private:
   ~FirefoxObserver() override {}
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
index d3fd519..96ac211 100644
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -35,12 +35,12 @@
 #include "chrome/common/importer/ie_importer_test_registry_overrider_win.h"
 #include "chrome/common/importer/ie_importer_utils_win.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/core/common/password_form.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/os_crypt/ie7_password_win.h"
 #include "components/search_engines/template_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -323,7 +323,7 @@ class TestObserver : public ProfileWriter,
   }
 
   virtual void AddFavicons(
-      const std::vector<ImportedFaviconUsage>& usage) override {
+      const favicon_base::FaviconUsageDataList& usage) override {
     // Importer should group the favicon information for each favicon URL.
     for (size_t i = 0; i < arraysize(kIEFaviconGroup); ++i) {
       GURL favicon_url(kIEFaviconGroup[i].favicon_url);
diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc
index c017f6e..b1c0861 100644
--- a/chrome/browser/importer/in_process_importer_bridge.cc
+++ b/chrome/browser/importer/in_process_importer_bridge.cc
@@ -11,10 +11,10 @@
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_autofill_form_data_entry.h"
 #include "components/autofill/core/browser/webdata/autofill_entry.h"
 #include "components/autofill/core/common/password_form.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_parser.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
@@ -194,7 +194,7 @@ void InProcessImporterBridge::AddIE7PasswordInfo(
 #endif  // OS_WIN
 
 void InProcessImporterBridge::SetFavicons(
-    const std::vector<ImportedFaviconUsage>& favicons) {
+    const favicon_base::FaviconUsageDataList& favicons) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ProfileWriter::AddFavicons, writer_, favicons));
diff --git a/chrome/browser/importer/in_process_importer_bridge.h b/chrome/browser/importer/in_process_importer_bridge.h
index 9761214..7066d56 100644
--- a/chrome/browser/importer/in_process_importer_bridge.h
+++ b/chrome/browser/importer/in_process_importer_bridge.h
@@ -17,7 +17,7 @@
 
 class GURL;
 struct ImportedBookmarkEntry;
-struct ImportedFaviconUsage;
+struct FaviconUsageData;
 class ExternalProcessImporterHost;
 
 namespace importer {
@@ -44,7 +44,7 @@ class InProcessImporterBridge : public ImporterBridge {
       const importer::ImporterIE7PasswordInfo& password_info) override;
 #endif
 
-  void SetFavicons(const std::vector<ImportedFaviconUsage>& favicons) override;
+  void SetFavicons(const favicon_base::FaviconUsageDataList& favicons) override;
 
   void SetHistoryItems(const std::vector<ImporterURLRow>& rows,
                        importer::VisitSource visit_source) override;
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index a33236d..bbc6fc5 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -24,7 +24,6 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
-#include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/pref_names.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ -236,7 +235,7 @@ void ProfileWriter::AddBookmarks(
 }
 
 void ProfileWriter::AddFavicons(
-    const std::vector<ImportedFaviconUsage>& favicons) {
+    const favicon_base::FaviconUsageDataList& favicons) {
   FaviconServiceFactory::GetForProfile(profile_,
                                        ServiceAccessType::EXPLICIT_ACCESS)
       ->SetImportedFavicons(favicons);
diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h
index 1c74ec9..fa326fb 100644
--- a/chrome/browser/importer/profile_writer.h
+++ b/chrome/browser/importer/profile_writer.h
@@ -13,11 +13,11 @@
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
+#include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/history_types.h"
 #include "url/gurl.h"
 
 struct ImportedBookmarkEntry;
-struct ImportedFaviconUsage;
 class Profile;
 class TemplateURL;
 
@@ -76,8 +76,7 @@ class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> {
       const std::vector<ImportedBookmarkEntry>& bookmarks,
       const base::string16& top_level_folder_name);
 
-  virtual void AddFavicons(
-      const std::vector<ImportedFaviconUsage>& favicons);
+  virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons);
 
   // Adds the TemplateURLs in |template_urls| to the local store.  The local
   // store becomes the owner of the TemplateURLs.  Some TemplateURLs in