Move most importer code to chrome/utility/importer

chrome/chrome.gyp

 # 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.
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 270 matching lines @@
             '<(grit_out_dir)',
           ],
         },
         {
           'target_name': 'utility',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../content/content.gyp:content_utility',
+            '../crypto/crypto.gyp:crypto',  # nss on Linux.

[gab, 2013/07/09 20:48:31]

So shouldn't this instead go in an 'OS=="linux" and use_openssl!=1' section or
something?

[scottmg, 2013/07/09 21:16:45]

Actually, I think the comment is wrong, it's just a dependency of nss_*.
Removed.

[gab, 2013/07/09 21:29:43]

Right, so the dependency should only exist if including the nss_* files, no?

             '../skia/skia.gyp:skia',
             '../third_party/libxml/libxml.gyp:libxml',
             'common',
           ],
           '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',

[gab, 2013/07/09 20:48:31]

nit: duplicate entry (there should probably be a presubmit check for this)

[scottmg, 2013/07/09 21:16:45]

Done.

+            '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_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',
             'utility/profile_import_handler.h',
           ],
           'include_dirs': [
             '..',
+            '<(grit_out_dir)',
           ],
           'conditions': [
             ['toolkit_uses_gtk == 1', {
               'dependencies': [
                 '../build/linux/system.gyp:gtk',
               ],
             }],
             ['OS=="win" or OS=="mac"', {
               'sources': [
                 'utility/itunes_library_parser.cc',
                 'utility/itunes_library_parser.h',
                 'utility/media_galleries/picasa_album_table_reader.cc',
                 'utility/media_galleries/picasa_album_table_reader.h',
                 'utility/media_galleries/picasa_albums_indexer.cc',
                 'utility/media_galleries/picasa_albums_indexer.h',
                 '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=="android"', {
               'sources!': [
+                'utility/importer/bookmark_html_reader.cc',
                 'utility/profile_import_handler.cc',
               ],
             }],
             ['enable_mdns == 1', {
               'sources': [
                 'utility/local_discovery/local_domain_resolver.cc',
                 'utility/local_discovery/local_domain_resolver.h',
                 'utility/local_discovery/service_discovery_client_impl.cc',
                 'utility/local_discovery/service_discovery_client_impl.h',
               ]
@@ skipping 845 matching lines @@
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
       ]}, # 'includes'
     ],  # OS=="android"
     ['configuration_policy==1 and OS!="android"', {
       'includes': [ 'policy.gypi', ],
     }],
   ],  # 'conditions'
 }