Cleanup: Reorganize extensions renderer build files so we only have to list...

Cleanup: Reorganize extensions renderer build files so we only have to list each file once, rather than two if they are excluded on Android.

Remove all native handlers from the Android build while we are at it.

BUG=402728

Review URL: https://codereview.chromium.org/566133002

Cr-Commit-Position: refs/heads/master@{#294887}

extensions/extensions.gyp

@@ -750,29 +750,16 @@
         'renderer/activity_log_converter_strategy.h',
         'renderer/api_activity_logger.cc',
         'renderer/api_activity_logger.h',
-        'renderer/api_definitions_natives.cc',
-        'renderer/api_definitions_natives.h',
         'renderer/app_runtime_custom_bindings.cc',
         'renderer/app_runtime_custom_bindings.h',
         'renderer/app_window_custom_bindings.cc',
         'renderer/app_window_custom_bindings.h',
-        'renderer/binding_generating_native_handler.cc',
-        'renderer/binding_generating_native_handler.h',
-        'renderer/blob_native_handler.cc',
-        'renderer/blob_native_handler.h',
         'renderer/console.cc',
         'renderer/console.h',
         'renderer/content_watcher.cc',
         'renderer/content_watcher.h',
-        'renderer/context_menus_custom_bindings.cc',
-        'renderer/context_menus_custom_bindings.h',
-        'renderer/css_native_handler.cc',
-        'renderer/css_native_handler.h',
         'renderer/default_dispatcher_delegate.cc',
         'renderer/default_dispatcher_delegate.h',
-        'renderer/dispatcher.cc',
-        'renderer/dispatcher.h',
-        'renderer/dispatcher_delegate.h',
         'renderer/document_custom_bindings.cc',
         'renderer/document_custom_bindings.h',
         'renderer/dom_activity_logger.cc',
@@ -788,32 +775,16 @@
         'renderer/extension_groups.h',
         'renderer/guest_view/guest_view_internal_custom_bindings.cc',
         'renderer/guest_view/guest_view_internal_custom_bindings.h',
-        'renderer/file_system_natives.cc',
-        'renderer/file_system_natives.h',
         'renderer/i18n_custom_bindings.cc',
         'renderer/i18n_custom_bindings.h',
         'renderer/id_generator_custom_bindings.cc',
         'renderer/id_generator_custom_bindings.h',
-        'renderer/lazy_background_page_native_handler.cc',
-        'renderer/lazy_background_page_native_handler.h',
-        'renderer/logging_native_handler.cc',
-        'renderer/logging_native_handler.h',
         'renderer/messaging_bindings.cc',
         'renderer/messaging_bindings.h',
         'renderer/module_system.cc',
         'renderer/module_system.h',
-        'renderer/native_handler.cc',
-        'renderer/native_handler.h',
-        'renderer/object_backed_native_handler.cc',
-        'renderer/object_backed_native_handler.h',
-        'renderer/print_native_handler.cc',
-        'renderer/print_native_handler.h',
-        'renderer/process_info_native_handler.cc',
-        'renderer/process_info_native_handler.h',
         'renderer/programmatic_script_injector.cc',
         'renderer/programmatic_script_injector.h',
-        'renderer/render_view_observer_natives.cc',
-        'renderer/render_view_observer_natives.h',
         'renderer/request_sender.cc',
         'renderer/request_sender.h',
         'renderer/resource_bundle_source_map.cc',
@@ -850,8 +821,6 @@
         'renderer/runtime_custom_bindings.h',
         'renderer/safe_builtins.cc',
         'renderer/safe_builtins.h',
-        'renderer/send_request_natives.cc',
-        'renderer/send_request_natives.h',
         'renderer/set_icon_natives.cc',
         'renderer/set_icon_natives.h',
         'renderer/scoped_persistent.h',
@@ -868,20 +837,6 @@
         'renderer/scripts_run_info.h',
         'renderer/static_v8_external_ascii_string_resource.cc',
         'renderer/static_v8_external_ascii_string_resource.h',
-        'renderer/test_features_native_handler.cc',
-        'renderer/test_features_native_handler.h',
-        'renderer/user_gestures_native_handler.cc',
-        'renderer/user_gestures_native_handler.h',
-        'renderer/user_script_injector.cc',
-        'renderer/user_script_injector.h',
-        'renderer/user_script_set.cc',
-        'renderer/user_script_set.h',
-        'renderer/user_script_set_manager.cc',
-        'renderer/user_script_set_manager.h',
-        'renderer/utils_native_handler.cc',
-        'renderer/utils_native_handler.h',
-        'renderer/v8_context_native_handler.cc',
-        'renderer/v8_context_native_handler.h',
         'renderer/v8_schema_registry.cc',
         'renderer/v8_schema_registry.h',
       ],
@@ -892,20 +847,52 @@
         # the extensions module altogether. These exemptions are taken
         # directly from chrome_renderer.gypi as sources are moved
         # from //chrome/renderer to //extensions/renderer.
-        ['OS == "android"', {
-          'sources!': [
+        ['OS != "android"', {
+          'sources': [
             'renderer/api_definitions_natives.cc',
+            'renderer/api_definitions_natives.h',
+            'renderer/binding_generating_native_handler.cc',
+            'renderer/binding_generating_native_handler.h',
+            'renderer/blob_native_handler.cc',
+            'renderer/blob_native_handler.h',
             'renderer/context_menus_custom_bindings.cc',
+            'renderer/context_menus_custom_bindings.h',
+            'renderer/css_native_handler.cc',
+            'renderer/css_native_handler.h',
             'renderer/dispatcher.cc',
             'renderer/dispatcher.h',
+            'renderer/dispatcher_delegate.h',
+            'renderer/file_system_natives.cc',
+            'renderer/file_system_natives.h',
+            'renderer/lazy_background_page_native_handler.cc',
+            'renderer/lazy_background_page_native_handler.h',
+            'renderer/logging_native_handler.cc',
+            'renderer/logging_native_handler.h',
+            'renderer/native_handler.cc',
+            'renderer/native_handler.h',
+            'renderer/object_backed_native_handler.cc',
+            'renderer/object_backed_native_handler.h',
+            'renderer/print_native_handler.cc',
+            'renderer/print_native_handler.h',
+            'renderer/process_info_native_handler.cc',
+            'renderer/process_info_native_handler.h',
             'renderer/render_view_observer_natives.cc',
             'renderer/send_request_natives.cc',
+            'renderer/send_request_natives.h',
+            'renderer/test_features_native_handler.cc',
+            'renderer/test_features_native_handler.h',
+            'renderer/user_gestures_native_handler.cc',
+            'renderer/user_gestures_native_handler.h',
             'renderer/user_script_injector.cc',
             'renderer/user_script_injector.h',
             'renderer/user_script_set.cc',
             'renderer/user_script_set.h',
             'renderer/user_script_set_manager.cc',
             'renderer/user_script_set_manager.h',
+            'renderer/utils_native_handler.cc',
+            'renderer/utils_native_handler.h',
+            'renderer/v8_context_native_handler.cc',
+            'renderer/v8_context_native_handler.h',
           ],
         }],
       ]

extensions/renderer/BUILD.gn

@@ -9,29 +9,16 @@ source_set("renderer") {
     "activity_log_converter_strategy.h",
     "api_activity_logger.cc",
     "api_activity_logger.h",
-    "api_definitions_natives.cc",
-    "api_definitions_natives.h",
     "app_runtime_custom_bindings.cc",
     "app_runtime_custom_bindings.h",
     "app_window_custom_bindings.cc",
     "app_window_custom_bindings.h",
-    "binding_generating_native_handler.cc",
-    "binding_generating_native_handler.h",
-    "blob_native_handler.cc",
-    "blob_native_handler.h",
     "console.cc",
     "console.h",
     "content_watcher.cc",
     "content_watcher.h",
-    "context_menus_custom_bindings.cc",
-    "context_menus_custom_bindings.h",
-    "css_native_handler.cc",
-    "css_native_handler.h",
     "default_dispatcher_delegate.cc",
     "default_dispatcher_delegate.h",
-    "dispatcher.cc",
-    "dispatcher.h",
-    "dispatcher_delegate.h",
     "document_custom_bindings.cc",
     "document_custom_bindings.h",
     "dom_activity_logger.cc",
@@ -47,32 +34,16 @@ source_set("renderer") {
     "extension_groups.h",
     "guest_view/guest_view_internal_custom_bindings.cc",
     "guest_view/guest_view_internal_custom_bindings.h",
-    "file_system_natives.cc",
-    "file_system_natives.h",
     "i18n_custom_bindings.cc",
     "i18n_custom_bindings.h",
     "id_generator_custom_bindings.cc",
     "id_generator_custom_bindings.h",
-    "lazy_background_page_native_handler.cc",
-    "lazy_background_page_native_handler.h",
-    "logging_native_handler.cc",
-    "logging_native_handler.h",
     "messaging_bindings.cc",
     "messaging_bindings.h",
     "module_system.cc",
     "module_system.h",
-    "native_handler.cc",
-    "native_handler.h",
-    "object_backed_native_handler.cc",
-    "object_backed_native_handler.h",
-    "print_native_handler.cc",
-    "print_native_handler.h",
-    "process_info_native_handler.cc",
-    "process_info_native_handler.h",
     "programmatic_script_injector.cc",
     "programmatic_script_injector.h",
-    "render_view_observer_natives.cc",
-    "render_view_observer_natives.h",
     "request_sender.cc",
     "request_sender.h",
     "resource_bundle_source_map.cc",
@@ -109,8 +80,6 @@ source_set("renderer") {
     "runtime_custom_bindings.h",
     "safe_builtins.cc",
     "safe_builtins.h",
-    "send_request_natives.cc",
-    "send_request_natives.h",
     "set_icon_natives.cc",
     "set_icon_natives.h",
     "scoped_persistent.h",
@@ -127,20 +96,6 @@ source_set("renderer") {
     "scripts_run_info.h",
     "static_v8_external_ascii_string_resource.cc",
     "static_v8_external_ascii_string_resource.h",
-    "test_features_native_handler.cc",
-    "test_features_native_handler.h",
-    "user_gestures_native_handler.cc",
-    "user_gestures_native_handler.h",
-    "user_script_injector.cc",
-    "user_script_injector.h",
-    "user_script_set.cc",
-    "user_script_set.h",
-    "user_script_set_manager.cc",
-    "user_script_set_manager.h",
-    "utils_native_handler.cc",
-    "utils_native_handler.h",
-    "v8_context_native_handler.cc",
-    "v8_context_native_handler.h",
     "v8_schema_registry.cc",
     "v8_schema_registry.h",
   ]
@@ -155,24 +110,56 @@ source_set("renderer") {
     "//third_party/WebKit/public:blink",
   ]
 
-  if (is_android) {
+  if (!is_android) {
     # Temporary condition for Android until it can stop building
     # the extensions module altogether. These exemptions are taken
     # directly from chrome_renderer.gypi as sources are moved
     # from //chrome/renderer to //extensions/renderer.
-    sources -= [
+    sources += [
       "api_definitions_natives.cc",
+      "api_definitions_natives.h",
+      "binding_generating_native_handler.cc",
+      "binding_generating_native_handler.h",
+      "blob_native_handler.cc",
+      "blob_native_handler.h",
       "context_menus_custom_bindings.cc",
+      "context_menus_custom_bindings.h",
+      "css_native_handler.cc",
+      "css_native_handler.h",
       "dispatcher.cc",
       "dispatcher.h",
+      "dispatcher_delegate.h",
+      "file_system_natives.cc",
+      "file_system_natives.h",
+      "lazy_background_page_native_handler.cc",
+      "lazy_background_page_native_handler.h",
+      "logging_native_handler.cc",
+      "logging_native_handler.h",
+      "native_handler.cc",
+      "native_handler.h",
+      "object_backed_native_handler.cc",
+      "object_backed_native_handler.h",
+      "print_native_handler.cc",
+      "print_native_handler.h",
+      "process_info_native_handler.cc",
+      "process_info_native_handler.h",
       "render_view_observer_natives.cc",
       "send_request_natives.cc",
+      "send_request_natives.h",
+      "test_features_native_handler.cc",
+      "test_features_native_handler.h",
+      "user_gestures_native_handler.cc",
+      "user_gestures_native_handler.h",
       "user_script_injector.cc",
       "user_script_injector.h",
       "user_script_set.cc",
       "user_script_set.h",
       "user_script_set_manager.cc",
       "user_script_set_manager.h",
+      "utils_native_handler.cc",
+      "utils_native_handler.h",
+      "v8_context_native_handler.cc",
+      "v8_context_native_handler.h",
     ]
   }