Move most importer code to chrome/utility/importer

chrome/utility/importer/safari_importer.h

 // 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.
 
-#ifndef CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
-#define CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
+#ifndef CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
+#define CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
-#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/importer/importer.h"
 #include "chrome/common/importer/importer_url_row.h"
+#include "chrome/utility/importer/importer.h"
 
 #if __OBJC__
 @class NSDictionary;
 @class NSString;
 #else
 class NSDictionary;
 class NSString;
 #endif
 
 class GURL;
 struct ImportedBookmarkEntry;
 struct ImportedFaviconUsage;
 
-namespace history {
-class URLRow;
-}
-
 namespace sql {
 class Connection;
 }
 
 // Importer for Safari on OS X.
 class SafariImporter : public Importer {
  public:
   // |library_dir| is the full path to the ~/Library directory,
   // We pass it in as a parameter for testing purposes.
   explicit SafariImporter(const base::FilePath& library_dir);
 
   // Importer:
   virtual void StartImport(const importer::SourceProfile& source_profile,
                            uint16 items,
                            ImporterBridge* bridge) OVERRIDE;
 
- // Does this user account have a Safari Profile and if so, what items
- // are supported?
- // in: library_dir - ~/Library or a standin for testing purposes.
- // out: services_supported - the service supported for import.
- // Returns true if we can import the Safari profile.
- static bool CanImport(const base::FilePath& library_dir,
-                       uint16* services_supported);
+  // Does this user account have a Safari Profile and if so, what items
+  // are supported?
+  // in: library_dir - ~/Library or a standin for testing purposes.
+  // out: services_supported - the service supported for import.
+  // Returns true if we can import the Safari profile.
+  static bool CanImport(const base::FilePath& library_dir,
+                        uint16* services_supported);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, BookmarkImport);
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, FaviconImport);
   FRIEND_TEST_ALL_PREFIXES(SafariImporterTest, HistoryImport);
 
   virtual ~SafariImporter();
 
   // Multiple URLs can share the same favicon; this is a map
   // of URLs -> IconIDs that we load as a temporary step before
@@ skipping 36 matching lines @@
   // Loads and reencodes the individual favicons.
   void LoadFaviconData(sql::Connection* db,
                        const FaviconMap& favicon_map,
                        std::vector<ImportedFaviconUsage>* favicons);
 
   base::FilePath library_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(SafariImporter);
 };
 
-#endif  // CHROME_BROWSER_IMPORTER_SAFARI_IMPORTER_H_
+#endif  // CHROME_UTILITY_IMPORTER_SAFARI_IMPORTER_H_