Revert of Exclude some extension apis for Aura Android

chrome/chrome_browser_extensions.gypi

Index: chrome/chrome_browser_extensions.gypi
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 7d6a19439f5bcdff217e5774491e7531c1b511c3..0f2325305de4b00a80189f887df09205087bcd89 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -67,24 +67,6 @@
       'browser/extensions/api/messaging/native_process_launcher_android.cc',
       'browser/extensions/api/messaging/native_process_launcher_posix.cc',
       'browser/extensions/api/messaging/native_process_launcher_win.cc',
-    ],
-    'chrome_browser_extensions_non_android_sources': [
-      'browser/extensions/api/gcd_private/gcd_private_api.cc',
-      'browser/extensions/api/gcd_private/gcd_private_api.h',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter.cc',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter.h',
-      'browser/extensions/api/gcd_private/privet_v3_session.cc',
-      'browser/extensions/api/gcd_private/privet_v3_session.h',
-      'browser/extensions/api/launcher_page/launcher_page_api.cc',
-      'browser/extensions/api/launcher_page/launcher_page_api.h',
-      'browser/extensions/api/mdns/dns_sd_delegate.cc',
-      'browser/extensions/api/mdns/dns_sd_delegate.h',
-      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
-      'browser/extensions/api/mdns/dns_sd_device_lister.h',
-      'browser/extensions/api/mdns/dns_sd_registry.cc',
-      'browser/extensions/api/mdns/dns_sd_registry.h',
-      'browser/extensions/api/mdns/mdns_api.cc',
-      'browser/extensions/api/mdns/mdns_api.h',
     ],
     'chrome_browser_extensions_enabled_sources': [
       'browser/apps/app_launch_for_metro_restart_win.cc',
@@ -310,6 +292,12 @@
       'browser/extensions/api/file_system/file_system_api.h',
       'browser/extensions/api/font_settings/font_settings_api.cc',
       'browser/extensions/api/font_settings/font_settings_api.h',
+      'browser/extensions/api/gcd_private/gcd_private_api.cc',
+      'browser/extensions/api/gcd_private/gcd_private_api.h',
+      'browser/extensions/api/gcd_private/privet_v3_context_getter.cc',
+      'browser/extensions/api/gcd_private/privet_v3_context_getter.h',
+      'browser/extensions/api/gcd_private/privet_v3_session.cc',
+      'browser/extensions/api/gcd_private/privet_v3_session.h',
       'browser/extensions/api/gcm/gcm_api.cc',
       'browser/extensions/api/gcm/gcm_api.h',
       'browser/extensions/api/history/history_api.cc',
@@ -364,12 +352,22 @@
       'browser/extensions/api/language_settings_private/language_settings_private_delegate.h',
       'browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.cc',
       'browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h',
+      'browser/extensions/api/launcher_page/launcher_page_api.cc',
+      'browser/extensions/api/launcher_page/launcher_page_api.h',
       'browser/extensions/api/location/location_api.cc',
       'browser/extensions/api/location/location_api.h',
       'browser/extensions/api/location/location_manager.cc',
       'browser/extensions/api/location/location_manager.h',
       'browser/extensions/api/management/chrome_management_api_delegate.cc',
       'browser/extensions/api/management/chrome_management_api_delegate.h',
+      'browser/extensions/api/mdns/dns_sd_delegate.cc',
+      'browser/extensions/api/mdns/dns_sd_delegate.h',
+      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
+      'browser/extensions/api/mdns/dns_sd_device_lister.h',
+      'browser/extensions/api/mdns/dns_sd_registry.cc',
+      'browser/extensions/api/mdns/dns_sd_registry.h',
+      'browser/extensions/api/mdns/mdns_api.cc',
+      'browser/extensions/api/mdns/mdns_api.h',
       'browser/extensions/api/media_galleries/media_galleries_api.cc',
       'browser/extensions/api/media_galleries/media_galleries_api.h',
       'browser/extensions/api/messaging/extension_message_port.cc',
@@ -1039,11 +1037,6 @@
             '<@(chrome_browser_extensions_non_chromeos_sources)',
           ],
         }],
-        ['OS!="android"', {
-          'sources': [
-            '<@(chrome_browser_extensions_non_android_sources)',
-          ],
-        }],
         ['use_ash==1', {
           'sources': [
             'browser/extensions/api/tabs/ash_panel_contents.cc',