[Sheriff] Revert "Revert "Revert 266297 "1. Handle the case of empty embedder_extension_id..."""

chrome/chrome_browser.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 714 matching lines @@
         'browser/google/google_util.cc',
         'browser/google/google_util.h',
         'browser/google/google_util_chromeos.cc',
         'browser/google/google_util_chromeos.h',
         'browser/gpu/gl_string_manager.cc',
         'browser/gpu/gl_string_manager.h',
         'browser/gpu/gpu_feature_checker.cc',
         'browser/gpu/gpu_feature_checker.h',
         'browser/gpu/gpu_mode_manager.cc',
         'browser/gpu/gpu_mode_manager.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/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/hang_monitor/hang_crash_dump_win.cc',
         'browser/hang_monitor/hang_crash_dump_win.h',
         'browser/hang_monitor/hung_plugin_action.cc',
         'browser/hang_monitor/hung_plugin_action.h',
         'browser/hang_monitor/hung_window_detector.cc',
         'browser/hang_monitor/hung_window_detector.h',
         'browser/history/android/android_cache_database.cc',
         'browser/history/android/android_cache_database.h',
         'browser/history/android/android_history_provider_service.cc',
         'browser/history/android/android_history_provider_service.h',
@@ skipping 2072 matching lines @@
             ['include', '^browser/policy/profile_policy_connector_factory.cc'],
             ['include', '^browser/policy/profile_policy_connector_factory.h'],
           ],
         }],
         ['enable_plugins==1', {
           'dependencies': [
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
           ],
         }, {  # enable_plugins==0
           'sources/': [
-            ['exclude', '^browser/guest_view/web_view/plugin_permission_helper'],
+            ['exclude', '^browser/guestview/webview/plugin_permission_helper'],
             ['exclude', '^browser/pepper_'],
             ['exclude', '^browser/plugins/'],
             ['exclude', '^browser/renderer_host/pepper/'],
           ],
         }],
         ['safe_browsing==1', {
           'defines': [
             'FULL_SAFE_BROWSING',
           ],
         }],
@@ skipping 865 matching lines @@
             'package_name': 'org/chromium/chrome/browser',
             'template_deps': ['browser/android/tab_load_status.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }