Componentize autofill dialog common code

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index f22f6b4ff7ada302f9f4c14dcaa866b512cf31bc..00af2342d13fb339f4fcfc84a7f2612bcc084f18 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -74,8 +74,6 @@
       'browser/ui/autofill/autofill_dialog_controller.h',
       'browser/ui/autofill/autofill_dialog_models.cc',
       'browser/ui/autofill/autofill_dialog_models.h',
-      'browser/ui/autofill/autofill_dialog_types.cc',
-      'browser/ui/autofill/autofill_dialog_types.h',
       'browser/ui/autofill/autofill_popup_controller.h',
       'browser/ui/autofill/autofill_popup_controller_impl.cc',
       'browser/ui/autofill/autofill_popup_controller_impl.h',
@@ -1215,10 +1213,10 @@
       'browser/ui/ash/multi_user/multi_user_window_manager_stub.h',
       'browser/ui/ash/multi_user/user_switch_animator_chromeos.cc',
       'browser/ui/ash/multi_user/user_switch_animator_chromeos.h',
-      'browser/ui/ash/networking_config_delegate_chromeos.cc',
-      'browser/ui/ash/networking_config_delegate_chromeos.h',
       'browser/ui/ash/network_connect_delegate_chromeos.cc',
       'browser/ui/ash/network_connect_delegate_chromeos.h',
+      'browser/ui/ash/networking_config_delegate_chromeos.cc',
+      'browser/ui/ash/networking_config_delegate_chromeos.h',
       'browser/ui/ash/session_state_delegate_chromeos.cc',
       'browser/ui/ash/session_state_delegate_chromeos.h',
       'browser/ui/ash/solid_color_user_wallpaper_delegate.cc',
@@ -2463,11 +2461,6 @@
     'chrome_browser_ui_non_app_list_sources': [
       'browser/ui/app_list/app_list_service_disabled.cc',
     ],
-    # Autofill sources used everywhere autofill dialog is enabled.
-    'chrome_browser_ui_autofill_dialog_sources': [
-      'browser/ui/autofill/autofill_dialog_common.cc',
-      'browser/ui/autofill/autofill_dialog_common.h',
-    ],
     # Autofill sources used on desktop and ChromeOS.
     'chrome_browser_ui_autofill_dialog_non_mobile_sources': [
       'browser/ui/autofill/autofill_dialog_controller_impl.cc',
@@ -2666,6 +2659,7 @@
         'common',
         'common_net',
         '../components/components.gyp:auto_login_parser',
+        '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:device_event_log_component',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:dom_distiller_webui',
@@ -3087,18 +3081,13 @@
         }, {
           'sources': [ '<@(chrome_browser_ui_non_app_list_sources)' ],
         }],
-        ['enable_autofill_dialog==1', {
-          'sources': [ '<@(chrome_browser_ui_autofill_dialog_sources)' ],
-          'conditions': [
-            ['OS!="android" and OS!="ios"', {
-              'sources': [
-                '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
-              ],
-              'dependencies': [
-                '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
-                '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',
-              ],
-            }],
+        ['enable_autofill_dialog==1 and OS!="android" and OS!="ios"', {
+          'sources': [
+            '<@(chrome_browser_ui_autofill_dialog_non_mobile_sources)',
+          ],
+          'dependencies': [
+            '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
+            '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',
           ],
         }],
         ['enable_extensions==1', {