Move most importer code to chrome/utility/importer

chrome/browser/importer/in_process_importer_bridge.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/importer/in_process_importer_bridge.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
@@ skipping 25 matching lines @@
     row.set_title(it->title);
     row.set_visit_count(it->visit_count);
     row.set_typed_count(it->typed_count);
     row.set_last_visit(it->last_visit);
     row.set_hidden(it->hidden);
     converted.push_back(row);
   }
   return converted;
 }
 
+history::VisitSource ConvertImporterVisitSourceToHistoryVisitSource(
+    ImporterVisitSource visit_source) {
+  switch (visit_source) {
+    case IMPORTER_VISIT_SOURCE_BROWSED:
+      return history::SOURCE_BROWSED;
+    case IMPORTER_VISIT_SOURCE_FIREFOX_IMPORTED:
+      return history::SOURCE_FIREFOX_IMPORTED;
+    case IMPORTER_VISIT_SOURCE_IE_IMPORTED:
+      return history::SOURCE_IE_IMPORTED;
+    case IMPORTER_VISIT_SOURCE_SAFARI_IMPORTED:
+      return history::SOURCE_SAFARI_IMPORTED;
+  };
+  NOTREACHED();
+  return history::SOURCE_SYNCED;
+}
+
 }  // namespace
 
 using content::BrowserThread;
 
 namespace {
 
 // FirefoxURLParameterFilter is used to remove parameter mentioning Firefox from
 // the search URL when importing search engines.
 class FirefoxURLParameterFilter : public TemplateURLParser::ParameterFilter {
  public:
@@ skipping 124 matching lines @@
 
 void InProcessImporterBridge::SetFavicons(
     const std::vector<ImportedFaviconUsage>& favicons) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ProfileWriter::AddFavicons, writer_, favicons));
 }
 
 void InProcessImporterBridge::SetHistoryItems(
     const std::vector<ImporterURLRow>& rows,
-    history::VisitSource visit_source) {
-  history::URLRows converted = ConvertImporterURLRowsToHistoryURLRows(rows);
-  BrowserThread::PostTask(
-      BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(
-          &ProfileWriter::AddHistoryPage, writer_, converted, visit_source));
+    ImporterVisitSource visit_source) {

[gab, 2013/07/08 15:18:08]

Can you introduce this new ImporterVisitSource in a precursor CLs, I would
prefer if this CL was a pure move-only (+includes rename) CL.

[scottmg, 2013/07/09 16:20:49]

Done.

+  history::URLRows converted_rows =
+      ConvertImporterURLRowsToHistoryURLRows(rows);
+  history::VisitSource converted_visit_source =
+      ConvertImporterVisitSourceToHistoryVisitSource(visit_source);
+  BrowserThread::PostTask(BrowserThread::UI,
+                          FROM_HERE,
+                          base::Bind(&ProfileWriter::AddHistoryPage,
+                                     writer_,
+                                     converted_rows,
+                                     converted_visit_source));
 }
 
 void InProcessImporterBridge::SetKeywords(
     const std::vector<importer::URLKeywordInfo>& url_keywords,
     bool unique_on_host_and_path) {
   ScopedVector<TemplateURL> owned_template_urls;
   for (size_t i = 0; i < url_keywords.size(); ++i) {
     owned_template_urls.push_back(
         CreateTemplateURL(url_keywords[i].display_name,
                           url_keywords[i].keyword,
@@ skipping 49 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&ExternalProcessImporterHost::NotifyImportEnded, host_));
 }
 
 string16 InProcessImporterBridge::GetLocalizedString(int message_id) {
   return l10n_util::GetStringUTF16(message_id);
 }
 
 InProcessImporterBridge::~InProcessImporterBridge() {}