Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id...""

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6ee7fa8d4e9c45f19a2ca938866558bdb8f01232..52ea8e4658c21082edb4b5b0f2d82786cd3ef0bc 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -730,27 +730,28 @@
         'browser/gpu/gpu_feature_checker.h',
         'browser/gpu/gpu_mode_manager.cc',
         'browser/gpu/gpu_mode_manager.h',
-        'browser/guestview/adview/adview_constants.cc',
-        'browser/guestview/adview/adview_constants.h',
-        'browser/guestview/adview/adview_guest.cc',
-        'browser/guestview/adview/adview_guest.h',
-        'browser/guestview/guestview_constants.cc',
-        'browser/guestview/guestview_constants.h',
-        'browser/guestview/guestview.cc',
-        'browser/guestview/guestview.h',
-        'browser/guestview/webview/context_menu_content_type_webview.cc',
-        'browser/guestview/webview/context_menu_content_type_webview.h',
-        'browser/guestview/webview/javascript_dialog_helper.cc',
-        'browser/guestview/webview/javascript_dialog_helper.h',
-        'browser/guestview/webview/plugin_permission_helper.cc',
-        'browser/guestview/webview/plugin_permission_helper.h',
-        'browser/guestview/webview/webview_constants.cc',
-        'browser/guestview/webview/webview_constants.h',
-        'browser/guestview/webview/webview_find_helper.cc',
-        'browser/guestview/webview/webview_find_helper.h',
-        'browser/guestview/webview/webview_guest.cc',
-        'browser/guestview/webview/webview_guest.h',
-        'browser/guestview/webview/webview_permission_types.h',
+        'browser/guest_view/ad_view/ad_view_constants.cc',
+        'browser/guest_view/ad_view/ad_view_constants.h',
+        'browser/guest_view/ad_view/ad_view_guest.cc',
+        'browser/guest_view/ad_view/ad_view_guest.h',
+        'browser/guest_view/guest_view_constants.cc',
+        'browser/guest_view/guest_view_constants.h',
+        'browser/guest_view/guest_view_base.cc',
+        'browser/guest_view/guest_view_base.h',
+        'browser/guest_view/guest_view.h',
+        'browser/guest_view/web_view/context_menu_content_type_web_view.cc',
+        'browser/guest_view/web_view/context_menu_content_type_web_view.h',
+        'browser/guest_view/web_view/javascript_dialog_helper.cc',
+        'browser/guest_view/web_view/javascript_dialog_helper.h',
+        'browser/guest_view/web_view/plugin_permission_helper.cc',
+        'browser/guest_view/web_view/plugin_permission_helper.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_find_helper.cc',
+        'browser/guest_view/web_view/web_view_find_helper.h',
+        'browser/guest_view/web_view/web_view_guest.cc',
+        'browser/guest_view/web_view/web_view_guest.h',
+        'browser/guest_view/web_view/web_view_permission_types.h',
         'browser/hang_monitor/hang_crash_dump_win.cc',
         'browser/hang_monitor/hang_crash_dump_win.h',
         'browser/hang_monitor/hung_plugin_action.cc',
@@ -2841,7 +2842,7 @@
           ],
         }, {  # enable_plugins==0
           'sources/': [
-            ['exclude', '^browser/guestview/webview/plugin_permission_helper'],
+            ['exclude', '^browser/guest_view/web_view/plugin_permission_helper'],
             ['exclude', '^browser/pepper_'],
             ['exclude', '^browser/plugins/'],
             ['exclude', '^browser/renderer_host/pepper/'],