Move most importer code to chrome/utility/importer

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 2ecf096c82dfb5762c7d2efdf69c242142ba2f97..71b5714006378c8dd1bbcd37e3dec37c93107424 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -288,6 +288,7 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../content/content.gyp:content_utility',
+            '../crypto/crypto.gyp:crypto',  # nss on Linux.
             '../skia/skia.gyp:skia',
             '../third_party/libxml/libxml.gyp:libxml',
             'common',
@@ -295,6 +296,36 @@
           'sources': [
             'utility/chrome_content_utility_client.cc',
             'utility/chrome_content_utility_client.h',
+            'utility/importer/bookmark_html_reader.cc',
+            'utility/importer/bookmark_html_reader.h',
+            'utility/importer/bookmarks_file_importer.cc',
+            'utility/importer/bookmarks_file_importer.h',
+            'utility/importer/external_process_importer_bridge.cc',
+            'utility/importer/external_process_importer_bridge.h',
+            'utility/importer/favicon_reencode.cc',
+            'utility/importer/favicon_reencode.h',
+            'utility/importer/firefox3_importer.cc',
+            'utility/importer/firefox3_importer.h',
+            'utility/importer/firefox_importer_unittest_messages_internal.h',
+            'utility/importer/firefox_importer_unittest_messages_internal.h',
+            'utility/importer/firefox_importer_unittest_utils.h',
+            'utility/importer/firefox_importer_unittest_utils_mac.cc',
+            'utility/importer/ie_importer.cc',
+            'utility/importer/ie_importer.h',
+            'utility/importer/importer.cc',
+            'utility/importer/importer.h',
+            'utility/importer/importer_creator.cc',
+            'utility/importer/importer_creator.h',
+            'utility/importer/nss_decryptor.cc',
+            'utility/importer/nss_decryptor.h',
+            'utility/importer/nss_decryptor_mac.h',
+            'utility/importer/nss_decryptor_mac.mm',
+            'utility/importer/nss_decryptor_system_nss.cc',
+            'utility/importer/nss_decryptor_system_nss.h',
+            'utility/importer/nss_decryptor_win.cc',
+            'utility/importer/nss_decryptor_win.h',
+            'utility/importer/safari_importer.h',
+            'utility/importer/safari_importer.mm',
             'utility/itunes_pref_parser_win.cc',
             'utility/itunes_pref_parser_win.h',
             'utility/profile_import_handler.cc',
@@ -302,6 +333,7 @@
           ],
           'include_dirs': [
             '..',
+            '<(grit_out_dir)',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
@@ -320,10 +352,27 @@
                 'utility/media_galleries/pmp_column_reader.cc',
                 'utility/media_galleries/pmp_column_reader.h',
               ],
+              'sources!': [
+                'utility/importer/nss_decryptor_system_nss.cc',
+                'utility/importer/nss_decryptor_system_nss.h',
+              ],
+            }],
+            ['use_openssl==1', {
+              'sources!': [
+                'utility/importer/nss_decryptor.cc',
+                'utility/importer/nss_decryptor_system_nss.cc',
+                'utility/importer/nss_decryptor_system_nss.h',
+              ]
+            }],
+            ['OS!="win"', {
+              'sources/': [
+                ['exclude', '^utility/importer/ie_importer.cc'],

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

Rename this file to ie_importer_win.cc instead (I've been wanting to do that for
some time, but this is the perfect opportunity).

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

Done.

+              ],
             }],
             ['OS=="android"', {
               'sources!': [
                 'utility/profile_import_handler.cc',
+                'utility/importer/bookmark_html_reader.cc',
               ],
             }],
             ['enable_mdns == 1', {