Implement <webview>.addContentScript/removeContentScript API [2]

extensions/extensions.gypi

Index: extensions/extensions.gypi
diff --git a/extensions/extensions.gypi b/extensions/extensions.gypi
index 24604c7298bacc0161a26618c36e0b3134547d13..fd576cd5a7f68bff73a2927999c87f118a00962a 100644
--- a/extensions/extensions.gypi
+++ b/extensions/extensions.gypi
@@ -243,8 +243,6 @@
       'browser/api/app_current_window_internal/app_current_window_internal_api.h',
       'browser/api/app_runtime/app_runtime_api.cc',
       'browser/api/app_runtime/app_runtime_api.h',
-      'browser/api/guest_view/app_view/app_view_guest_internal_api.cc',
-      'browser/api/guest_view/app_view/app_view_guest_internal_api.h',
       'browser/api/app_window/app_window_api.cc',
       'browser/api/app_window/app_window_api.h',
       'browser/api/async_api_function.cc',
@@ -342,12 +340,16 @@
       'browser/api/document_scan/document_scan_interface_chromeos.cc',
       'browser/api/execute_code_function.cc',
       'browser/api/execute_code_function.h',
-      'browser/api/guest_view/extension_view/extension_view_internal_api.cc',
-      'browser/api/guest_view/extension_view/extension_view_internal_api.h',
       'browser/api/extensions_api_client.cc',
       'browser/api/extensions_api_client.h',
+      'browser/api/guest_view/app_view/app_view_guest_internal_api.cc',
+      'browser/api/guest_view/app_view/app_view_guest_internal_api.h',
+      'browser/api/guest_view/extension_view/extension_view_internal_api.cc',
+      'browser/api/guest_view/extension_view/extension_view_internal_api.h',
       'browser/api/guest_view/guest_view_internal_api.cc',
       'browser/api/guest_view/guest_view_internal_api.h',
+      'browser/api/guest_view/web_view/web_view_internal_api.cc',
+      'browser/api/guest_view/web_view/web_view_internal_api.h',
       'browser/api/hid/hid_api.cc',
       'browser/api/hid/hid_api.h',
       'browser/api/hid/hid_connection_resource.cc',
@@ -498,8 +500,6 @@
       'browser/api/web_request/web_request_permissions.h',
       'browser/api/web_request/web_request_time_tracker.cc',
       'browser/api/web_request/web_request_time_tracker.h',
-      'browser/api/guest_view/web_view/web_view_internal_api.cc',
-      'browser/api/guest_view/web_view/web_view_internal_api.h',
       'browser/api/webcam_private/webcam_private_api.h',
       'browser/api/webcam_private/webcam_private_api_chromeos.cc',
       'browser/api_activity_monitor.h',
@@ -550,8 +550,6 @@
       'browser/declarative_user_script_manager.h',
       'browser/declarative_user_script_master.cc',
       'browser/declarative_user_script_master.h',
-      'browser/extension_user_script_loader.cc',
-      'browser/extension_user_script_loader.h',
       'browser/deferred_start_render_host.h',
       'browser/deferred_start_render_host_observer.h',
       'browser/error_map.cc',
@@ -603,6 +601,8 @@
       'browser/extension_system.h',
       'browser/extension_system_provider.cc',
       'browser/extension_system_provider.h',
+      'browser/extension_user_script_loader.cc',
+      'browser/extension_user_script_loader.h',
       'browser/extension_util.cc',
       'browser/extension_util.h',
       'browser/extension_web_contents_observer.cc',
@@ -660,6 +660,10 @@
       'browser/guest_view/surface_worker/surface_worker_guest.h',
       'browser/guest_view/web_view/javascript_dialog_helper.cc',
       'browser/guest_view/web_view/javascript_dialog_helper.h',
+      'browser/guest_view/web_view/web_ui/web_ui_url_fetcher.cc',
+      'browser/guest_view/web_view/web_ui/web_ui_url_fetcher.h',
+      'browser/guest_view/web_view/web_ui/web_ui_url_fetcher_group.cc',
+      'browser/guest_view/web_view/web_ui/web_ui_url_fetcher_group.h',
       'browser/guest_view/web_view/web_view_constants.cc',
       'browser/guest_view/web_view/web_view_constants.h',
       'browser/guest_view/web_view/web_view_content_script_manager.cc',
@@ -779,6 +783,8 @@
       'browser/warning_service_factory.h',
       'browser/warning_set.cc',
       'browser/warning_set.h',
+      'browser/web_ui_user_script_loader.cc',
+      'browser/web_ui_user_script_loader.h',
     ],
     'extensions_browser_sources_chromeos': [
       'browser/api/audio/audio_service_chromeos.cc',
@@ -943,10 +949,10 @@
       'renderer/script_context.h',
       'renderer/script_context_set.cc',
       'renderer/script_context_set.h',
-      'renderer/script_injection_callback.cc',
-      'renderer/script_injection_callback.h',
       'renderer/script_injection.cc',
       'renderer/script_injection.h',
+      'renderer/script_injection_callback.cc',
+      'renderer/script_injection_callback.h',
       'renderer/script_injection_manager.cc',
       'renderer/script_injection_manager.h',
       'renderer/script_injector.h',