Move most importer code to chrome/utility/importer

chrome/utility/importer/safari_importer.mm

 // 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 <Cocoa/Cocoa.h>
 
-#include "chrome/browser/importer/safari_importer.h"
+#include "chrome/utility/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/browser/favicon/favicon_util.h"
-#include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
+#include "chrome/common/importer/importer_bridge.h"

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

nit: alpha order

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

same

 #include "chrome/common/url_constants.h"
+#include "chrome/utility/importer/favicon_reencode.h"
 #include "grit/generated_resources.h"
 #include "net/base/data_url.h"
 #include "sql/statement.h"
 #include "url/gurl.h"
 
 namespace {
 
 // A function like this is used by other importers in order to filter out
 // URLS we don't want to import.
 // For now it's pretty basic, but I've split it out so it's easy to slot
 // in necessary logic for filtering URLS, should we need it.
 bool CanImportSafariURL(const GURL& url) {
   // The URL is not valid.
   if (!url.is_valid())
     return false;
 
   return true;
 }
 
 }  // namespace
 
 SafariImporter::SafariImporter(const base::FilePath& library_dir)
     : library_dir_(library_dir) {
 }
 
 SafariImporter::~SafariImporter() {
 }
 
-// static
-bool SafariImporter::CanImport(const base::FilePath& library_dir,
-                               uint16* services_supported) {
-  DCHECK(services_supported);
-  *services_supported = importer::NONE;
-
-  // Import features are toggled by the following:
-  // bookmarks import: existence of ~/Library/Safari/Bookmarks.plist file.
-  // history import: existence of ~/Library/Safari/History.plist file.
-  base::FilePath safari_dir = library_dir.Append("Safari");
-  base::FilePath bookmarks_path = safari_dir.Append("Bookmarks.plist");
-  base::FilePath history_path = safari_dir.Append("History.plist");
-
-  if (file_util::PathExists(bookmarks_path))
-    *services_supported |= importer::FAVORITES;
-  if (file_util::PathExists(history_path))
-    *services_supported |= importer::HISTORY;
-
-  return *services_supported != importer::NONE;
-}
-
 void SafariImporter::StartImport(const importer::SourceProfile& source_profile,
                                  uint16 items,
                                  ImporterBridge* bridge) {
   bridge_ = bridge;
   // The order here is important!
   bridge_->NotifyStarted();
 
   // In keeping with import on other platforms (and for other browsers), we
   // don't import the home page (since it may lead to a useless homepage); see
   // crbug.com/25603.
@@ skipping 87 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);
     }
   }
 }
 
 void SafariImporter::RecursiveReadBookmarksFolder(
     NSDictionary* bookmark_folder,
@@ skipping 125 matching lines @@
   // the user needing to explicitly input his username in a page and blurring
   // the field before we pick it up, but the details of that are beyond the
   // scope of this comment.
 }
 
 void SafariImporter::ImportHistory() {
   std::vector<ImporterURLRow> rows;
   ParseHistoryItems(&rows);
 
   if (!rows.empty() && !cancelled()) {
-    bridge_->SetHistoryItems(rows, history::SOURCE_SAFARI_IMPORTED);
+    bridge_->SetHistoryItems(rows, IMPORTER_VISIT_SOURCE_SAFARI_IMPORTED);
   }
 }
 
 double SafariImporter::HistoryTimeToEpochTime(NSString* history_time) {
   DCHECK(history_time);
   // Add Difference between Unix epoch and CFAbsoluteTime epoch in seconds.
   // Unix epoch is 1970-01-01 00:00:00.0 UTC,
   // CF epoch is 2001-01-01 00:00:00.0 UTC.
   return CFStringGetDoubleValue(base::mac::NSToCFCast(history_time)) +
       kCFAbsoluteTimeIntervalSince1970;
@@ skipping 54 matching lines @@
     if (!last_visit_str)
       continue;
 
     // Convert Safari's last visit time to Unix Epoch time.
     double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
     row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch);
 
     history_items->push_back(row);
   }
 }