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

chrome/browser/guestview/webview/plugin_permission_helper.cc

-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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.
 
-#include "chrome/browser/guest_view/web_view/plugin_permission_helper.h"
+#include "chrome/browser/guestview/webview/plugin_permission_helper.h"
 
-#include "chrome/browser/guest_view/web_view/web_view_guest.h"
-#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
+#include "chrome/browser/guestview/webview/webview_guest.h"
+#include "chrome/browser/guestview/webview/webview_permission_types.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 
 using content::BrowserPluginGuestDelegate;
 using content::RenderViewHost;
 using content::WebContents;
 
@@ skipping 81 matching lines @@
 #endif // defined(ENABLE_PLUGIN_INSTALLATION)
 
 void PluginPermissionHelper::OnPermissionResponse(const std::string& identifier,
                                                   bool allow,
                                                   const std::string& input) {
   if (allow) {
     ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
         web_contents(), true, identifier);
   }
 }