In components/autofill, move common/ to core/common/

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/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/browser/autofill_regex_constants.cc.utf8'],
       }],
     },
   ],
   'conditions': [
     ['OS != "ios"', {
       'targets': [
         {
-          'target_name': 'autofill_common',
+          'target_name': 'autofill_core_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',
             '../ui/ui.gyp:ui',
             '../url/url.gyp:url_lib',
           ],
           'conditions': [
             ['OS == "android"', {
               'dependencies': [
                 'autofill_jni_headers',
               ],
             }],
           ],
           'include_dirs': [
             '..',
             '<(SHARED_INTERMEDIATE_DIR)/autofill'
           ],
           'sources': [
             'autofill/browser/android/auxiliary_profile_loader_android.cc',
             'autofill/browser/android/auxiliary_profile_loader_android.h',
             'autofill/browser/android/auxiliary_profiles_android.cc',
             'autofill/browser/android/auxiliary_profiles_android.h',
             'autofill/browser/android/component_jni_registrar.cc',
             'autofill/browser/android/component_jni_registrar.h',
             'autofill/browser/android/personal_data_manager_android.cc',
-            'autofill/common/autocheckout_status.h',
-            'autofill/common/autofill_constants.cc',
-            'autofill/common/autofill_constants.h',
-            'autofill/common/autofill_messages.h',
-            'autofill/common/autofill_message_generator.cc',
-            'autofill/common/autofill_message_generator.h',
-            'autofill/common/autofill_pref_names.cc',
-            'autofill/common/autofill_pref_names.h',
-            'autofill/common/autofill_switches.cc',
-            'autofill/common/autofill_switches.h',
-            'autofill/common/form_data.cc',
-            'autofill/common/form_data.h',
-            'autofill/common/form_data_predictions.cc',
-            'autofill/common/form_data_predictions.h',
-            'autofill/common/form_field_data.cc',
-            'autofill/common/form_field_data.h',
-            'autofill/common/form_field_data_predictions.cc',
-            'autofill/common/form_field_data_predictions.h',
-            'autofill/common/password_form_fill_data.cc',
-            'autofill/common/password_form_fill_data.h',
-            'autofill/common/password_generation_util.cc',
-            'autofill/common/password_generation_util.h',
-            'autofill/common/web_element_descriptor.cc',
-            'autofill/common/web_element_descriptor.h',
+            'autofill/core/common/autocheckout_status.h',
+            '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_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_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',
           ],
         },
 
         {
-          # TODO(blundell): Eliminate this target; instead, have only the
-          # autofill_content_browser target and a new top-level
-          # autofill_shared target. crbug.com/247015
+          # TODO(blundell): Move this target to autofill_core_browser.
+          # crbug.com/247015
           'target_name': 'autofill_browser',
           'type': 'static_library',
           'include_dirs': [
             '..',
           ],
           'dependencies': [
-            'autofill_common',
+            'autofill_core_common',
             'autofill_regexes',
             'encryptor',
             'user_prefs',
             'webdata_common',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:base_prefs',
             '../content/content.gyp:content_browser',
             '../content/content.gyp:content_common',
             '../google_apis/google_apis.gyp:google_apis',
@@ skipping 133 matching lines @@
          'include_dirs': [ '..' ],
        },
        {
           'target_name': 'autofill_content_browser',
           'type': 'static_library',
           'include_dirs': [
             '..',
           ],
           'dependencies': [
             'autofill_browser',
-            'autofill_common',
             'autofill_content_risk_proto',
+            'autofill_core_common',
             'autofill_regexes',
             'encryptor',
             'user_prefs',
             'webdata_common',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:base_prefs',
             '../content/content.gyp:content_browser',
             '../content/content.gyp:content_common',
             '../google_apis/google_apis.gyp:google_apis',
@@ skipping 51 matching lines @@
           'msvs_disabled_warnings': [4267, ],
         },
 
         {
           'target_name': 'autofill_content_renderer',
           'type': 'static_library',
           'include_dirs': [
             '..',
           ],
           'dependencies': [
-            'autofill_common',
+            'autofill_core_common',
             '../base/base.gyp:base',
             '../content/content.gyp:content_renderer',
             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
             '../skia/skia.gyp:skia',
 
             'component_resources.gyp:component_resources',
           ],
           'sources': [
             'autofill/content/renderer/autofill_agent.cc',
@@ skipping 37 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'autofill',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }