Index: chrome/utility/importer/firefox3_importer.cc |
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/utility/importer/firefox3_importer.cc |
similarity index 97% |
rename from chrome/browser/importer/firefox3_importer.cc |
rename to chrome/utility/importer/firefox3_importer.cc |
index 50a0d0cee950e205ca7673cf0c18e20a924edb0b..6739f5b65146ae26562aa27fecb2a8b37f81fd10 100644 |
--- a/chrome/browser/importer/firefox3_importer.cc |
+++ b/chrome/utility/importer/firefox3_importer.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 "chrome/browser/importer/firefox3_importer.h" |
+#include "chrome/utility/importer/firefox3_importer.h" |
#include <set> |
@@ -13,25 +13,22 @@ |
#include "base/stl_util.h" |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
-#include "chrome/browser/browser_process.h" |
-#include "chrome/browser/importer/bookmark_html_reader.h" |
-#include "chrome/browser/importer/firefox_importer_utils.h" |
-#include "chrome/browser/importer/importer_bridge.h" |
-#include "chrome/browser/importer/nss_decryptor.h" |
-#include "chrome/browser/importer/reencode_favicon.h" |
+#include "chrome/common/importer/firefox_importer_utils.h" |
+#include "chrome/common/importer/firefox_importer_utils.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_url_row.h" |
#include "chrome/common/time_format.h" |
-#include "content/public/browser/browser_thread.h" |
+#include "chrome/utility/importer/bookmark_html_reader.h" |
+#include "chrome/utility/importer/favicon_reencode.h" |
+#include "chrome/utility/importer/nss_decryptor.h" |
#include "content/public/common/password_form.h" |
#include "grit/generated_resources.h" |
#include "sql/connection.h" |
#include "sql/statement.h" |
#include "url/gurl.h" |
-using content::BrowserThread; |
- |
namespace { |
// Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/ |
@@ -580,7 +577,7 @@ void Firefox3Importer::LoadFavicons( |
if (data.empty()) |
continue; // Data definitely invalid. |
- if (!ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
+ if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data)) |
continue; // Unable to decode. |
usage.urls = i->second; |