Move most importer code to chrome/utility/importer

chrome/utility/importer/ie_importer.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/ie_importer.h"
+#include "chrome/utility/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
 #include <urlhist.h>
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
-#include "chrome/browser/favicon/favicon_util.h"
-#include "chrome/browser/importer/ie_importer_utils_win.h"
-#include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/browser/importer/pstore_declarations.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/common/importer/importer_url_row.h"
+#include "chrome/common/importer/pstore_declarations.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/utility/importer/favicon_reencode.h"
 #include "content/public/common/password_form.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Registry key paths from which we import IE settings.
 const char16 kSearchScopePath[] =
   L"Software\\Microsoft\\Internet Explorer\\SearchScopes";
@@ skipping 303 matching lines @@
                               const GURL& favicon_url,
                               std::vector<unsigned char>* data) {
   std::string image_data;
   if (!ReadFaviconDataFromInternetShortcut(file, &image_data) &&
       !ReadFaviconDataFromCache(favicon_url, &image_data)) {
     return false;
   }
 
   const unsigned char* ptr =
       reinterpret_cast<const unsigned char*>(image_data.c_str());
-  return FaviconUtil::ReencodeFavicon(ptr, image_data.size(), data);
+  return importer::ReencodeFavicon(ptr, image_data.size(), data);
 }
 
 // Loads favicon image data and registers to |favicon_map|.
 void UpdateFaviconMap(
     const string16& url_file,
     const GURL& url,
     IUniformResourceLocator* url_locator,
     std::map<GURL, ImportedFaviconUsage>* favicon_map) {
   GURL favicon_url = ReadFaviconURLFromInternetShortcut(url_locator);
   if (!favicon_url.is_valid())
@@ skipping 139 matching lines @@
         row.visit_count = 1;
         row.hidden = false;
       } else {
         row.hidden = true;
       }
 
       rows.push_back(row);
     }
 
     if (!rows.empty() && !cancelled()) {
-      bridge_->SetHistoryItems(rows, history::SOURCE_IE_IMPORTED);
+      bridge_->SetHistoryItems(rows, IMPORTER_VISIT_SOURCE_IE_IMPORTED);
     }
   }
 }
 
 void IEImporter::ImportPasswordsIE6() {
   GUID AutocompleteGUID = kPStoreAutocompleteGUID;
   if (!source_path_.empty()) {
     // We supply a fake GUID for testting.
     AutocompleteGUID = kUnittestGUID;
   }
@@ skipping 339 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }