Moved ipc-specific files from autofill/core to autofill/content.

components/autofill.gypi

 # Copyright (c) 2013 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.
 
 {
   'targets': [
     {
       # Private target only used in components/autofill.
       'target_name': 'autofill_regexes',
       'type': 'none',
       'actions': [{
         'action_name': 'autofill_regexes',
         'inputs': [
           '<(DEPTH)/build/escape_unicode.py',
           'autofill/core/browser/autofill_regex_constants.cc.utf8',
         ],
         'outputs': [
           '<(SHARED_INTERMEDIATE_DIR)/autofill_regex_constants.cc',
         ],
         'action': ['python', '<(DEPTH)/build/escape_unicode.py',
                    '-o', '<(SHARED_INTERMEDIATE_DIR)',
                    'autofill/core/browser/autofill_regex_constants.cc.utf8'],
       }],
     },
   ],
   'conditions': [
     ['OS != "ios"', {
       'targets': [
         {
-          'target_name': 'autofill_core_common',
+          'target_name': 'autofill_content_common',

[blundell, 2013/12/11 13:32:53]

nit: This target would be better-placed directly above autofill_content_browser.

[jeanfrancois, 2013/12/11 15:01:19]

Done.

           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',

[blundell, 2013/12/11 13:32:53]

This needs a dependency on autofill_core_common.

[jeanfrancois, 2013/12/11 15:01:19]

Done.

             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
             '../third_party/WebKit/public/blink.gyp:blink_minimal',
             '../ui/gfx/gfx.gyp:gfx',
+          ],

[jeanfrancois, 2013/12/11 13:04:46]

I haven't included dependencies to 'autofill_jni_headers', but I'm not sure it's
the correct thing to do.

+          'include_dirs': [
+            '..',
+            '<(SHARED_INTERMEDIATE_DIR)/autofill'
+          ],
+          'sources': [
+            'autofill/content/common/autofill_messages.h',
+            'autofill/content/common/autofill_message_generator.cc',
+            'autofill/content/common/autofill_message_generator.h',
+            'autofill/content/common/autofill_param_traits_macros.h',
+          ],
+        },
+
+        {
+          'target_name': 'autofill_core_common',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_common',

[blundell, 2013/12/11 13:32:53]

This dependency can go.

[jeanfrancois, 2013/12/11 15:01:19]

Done.

+            '../third_party/WebKit/public/blink.gyp:blink_minimal',

[blundell, 2013/12/11 13:32:53]

This dependency can go.

[jeanfrancois, 2013/12/11 15:01:19]

Done.

+            '../ui/gfx/gfx.gyp:gfx',
             '../ui/ui.gyp:ui',
             '../url/url.gyp:url_lib',

[jif-google, 2013/12/11 13:23:56]

forgot to add the dependency to autofill_content_common

           ],
           'conditions': [
             ['OS == "android"', {
               'dependencies': [
                 'autofill_jni_headers',
               ],
             }],
           ],
           'include_dirs': [
             '..',
             '<(SHARED_INTERMEDIATE_DIR)/autofill'
           ],
           'sources': [
             'autofill/core/browser/android/auxiliary_profile_loader_android.cc',
             'autofill/core/browser/android/auxiliary_profile_loader_android.h',
             'autofill/core/browser/android/auxiliary_profiles_android.cc',
             'autofill/core/browser/android/auxiliary_profiles_android.h',
             'autofill/core/browser/android/component_jni_registrar.cc',
             'autofill/core/browser/android/component_jni_registrar.h',
             'autofill/core/browser/android/personal_data_manager_android.cc',
             'autofill/core/common/autofill_constants.cc',
             'autofill/core/common/autofill_constants.h',
-            'autofill/core/common/autofill_messages.h',
-            'autofill/core/common/autofill_message_generator.cc',
-            'autofill/core/common/autofill_message_generator.h',
-            'autofill/core/common/autofill_param_traits_macros.h',
             'autofill/core/common/autofill_pref_names.cc',
             'autofill/core/common/autofill_pref_names.h',
             'autofill/core/common/autofill_switches.cc',
             'autofill/core/common/autofill_switches.h',
             'autofill/core/common/form_data.cc',
             'autofill/core/common/form_data.h',
             'autofill/core/common/form_data_predictions.cc',
             'autofill/core/common/form_data_predictions.h',
             'autofill/core/common/form_field_data.cc',
             'autofill/core/common/form_field_data.h',
@@ skipping 324 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'autofill',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }