Move most importer code to chrome/utility/importer

chrome/utility/importer/firefox3_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/firefox3_importer.h"
+#include "chrome/utility/importer/firefox3_importer.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #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/favicon/favicon_util.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/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"

[gab, 2013/07/10 13:40:44]

need DEPS on sql/

 #include "sql/statement.h"
 #include "url/gurl.h"

[gab, 2013/07/10 13:40:44]

need DEPS on url/

[tfarina, 2013/07/10 13:48:26]

no, everybody is allowed to include from url/, see the master DEPS file in
src/DEPS.

 
-using content::BrowserThread;
-
 namespace {
 
 // Original definition is in http://mxr.mozilla.org/firefox/source/toolkit/
 //  components/places/public/nsINavBookmarksService.idl
 enum BookmarkItemType {
   TYPE_BOOKMARK = 1,
   TYPE_FOLDER = 2,
   TYPE_SEPARATOR = 3,
   TYPE_DYNAMIC_CONTAINER = 4
 };
@@ skipping 528 matching lines @@
 
       usage.favicon_url = GURL(s.ColumnString(0));
       if (!usage.favicon_url.is_valid())
         continue;  // Don't bother importing favicons with invalid URLs.
 
       std::vector<unsigned char> data;
       s.ColumnBlobAsVector(1, &data);
       if (data.empty())
         continue;  // Data definitely invalid.
 
-      if (!FaviconUtil::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;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }