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',
@@ skipping 12 matching lines @@
       }],
     },
   ],
   'conditions': [
     ['OS != "ios"', {
       'targets': [
         {
           'target_name': 'autofill_core_common',
           'type': 'static_library',
           'dependencies': [
+            'autofill_content_common',

[blundell, 2013/12/11 15:42:06]

The dependency needs to be the other way around: autofill_content_common depends
on autofill_core_common.

[jif-google, 2013/12/12 09:54:00]

Done.

             '../base/base.gyp:base',
-            '../content/content.gyp:content_common',
-            '../ipc/ipc.gyp:ipc',
-            '../third_party/WebKit/public/blink.gyp:blink_minimal',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/ui.gyp:ui',
             '../url/url.gyp:url_lib',
           ],
           'conditions': [
             ['OS == "android"', {
               'dependencies': [
                 'autofill_jni_headers',
               ],
             }],
           ],
           'include_dirs': [
             '..',
             '<(SHARED_INTERMEDIATE_DIR)/autofill'

[blundell, 2013/12/11 15:42:06]

Was this just for the IPC code? If so it's not necessary anymore.

[jif-google, 2013/12/12 09:54:00]

It's not necessary anymore.

           ],
           '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',
             'autofill/core/common/form_field_data_predictions.cc',
             'autofill/core/common/form_field_data_predictions.h',
             'autofill/core/common/password_form.cc',
             'autofill/core/common/password_form.h',
             'autofill/core/common/password_form_fill_data.cc',
             'autofill/core/common/password_form_fill_data.h',
             'autofill/core/common/password_generation_util.cc',
             'autofill/core/common/password_generation_util.h',
             'autofill/core/common/web_element_descriptor.cc',
             'autofill/core/common/web_element_descriptor.h',
           ],
         },
 
         {
+          'target_name': 'autofill_content_common',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../content/content.gyp:content_common',
+            '../ipc/ipc.gyp:ipc',
+            '../third_party/WebKit/public/blink.gyp:blink_minimal',
+            '../ui/gfx/gfx.gyp:gfx',
+          ],
+          'include_dirs': [
+            '..',
+            '<(SHARED_INTERMEDIATE_DIR)/autofill'

[blundell, 2013/12/11 15:42:06]

Needs a ','.

[jif-google, 2013/12/12 09:54:00]

Removed the '<(SHARED_INTERMEDIATE_DIR)/autofill' part instead as it builds fine
with out it.

+          ],
+          '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_browser',
           'type': 'static_library',
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             'autofill_core_common',
             'autofill_regexes',
             'encryptor',
             'user_prefs',
@@ skipping 300 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'autofill',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }