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

components/autofill.gypi

Index: components/autofill.gypi
diff --git a/components/autofill.gypi b/components/autofill.gypi
index f54df9c46501fb5b77c8adc4fc1edfb685e74677..98052fbeeba71de778059cc2b3b2ab7b30f0cddf 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -27,7 +27,7 @@
     ['OS != "ios"', {
       'targets': [
         {
-          'target_name': 'autofill_common',
+          'target_name': 'autofill_core_common',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
@@ -56,44 +56,43 @@
             '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',
@@ -247,8 +246,8 @@
           ],
           'dependencies': [
             'autofill_browser',
-            'autofill_common',
             'autofill_content_risk_proto',
+            'autofill_core_common',
             'autofill_regexes',
             'encryptor',
             'user_prefs',
@@ -320,7 +319,7 @@
             '..',
           ],
           'dependencies': [
-            'autofill_common',
+            'autofill_core_common',
             '../base/base.gyp:base',
             '../content/content.gyp:content_renderer',
             '../content/content.gyp:content_common',