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 39f6177e61919486d99fdd15f63a4475b6440b88..3cf5e58e36a547a7cd1858f20d7ead4db41a13a0 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -300,6 +300,33 @@
             'utility/chrome_content_utility_client.h',
             'utility/extensions/unpacker.cc',
             'utility/extensions/unpacker.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_utils.h',
+            'utility/importer/firefox_importer_unittest_utils_mac.cc',
+            'utility/importer/ie_importer_win.cc',
+            'utility/importer/ie_importer_win.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_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',
@@ -307,6 +334,7 @@
           ],
           'include_dirs': [
             '..',
+            '<(grit_out_dir)',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
@@ -326,8 +354,23 @@
                 'utility/media_galleries/pmp_column_reader.h',
               ],
             }],
+            ['use_openssl==1', {
+              'sources!': [
+                'utility/importer/nss_decryptor.cc',

[gab, 2013/07/15 22:41:23]

It seems weird to me that this is not with the rest of the NSS file, and even
more weird that the nss_decryptor_*.(cc|mm) files are not here?!

(I know the current state mimics the old behavior, but this new way of including
the files makes it clearer something is wrong here... This is thus not a blocker
for this CL... but something to keep in mind... is use_openssl==1 even
supported?!)

+              ]
+            }],
+            ['OS!="win" and OS!="mac" and use_openssl==0', {
+              'dependencies': [
+                '../crypto/crypto.gyp:crypto',
+              ],
+              'sources': [
+                'utility/importer/nss_decryptor_system_nss.cc',
+                'utility/importer/nss_decryptor_system_nss.h',
+              ],
+            }],
             ['OS=="android"', {
               'sources!': [
+                'utility/importer/bookmark_html_reader.cc',
                 'utility/profile_import_handler.cc',
               ],
             }],