Move permission check from GuestViewInternal to derived GuestView

BUG=364141

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282766 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc

@@ -12,12 +12,6 @@
 #include "content/public/browser/render_view_host.h"
 #include "extensions/common/permissions/permissions_data.h"
 
-namespace {
-const char* kPermissionRequiredError =
-    "\"webview\" or \"appview\" permission is required for allocating "
-    "instance ID.";
-}  // namespace
-
 namespace extensions {
 
 GuestViewInternalCreateGuestFunction::
@@ -31,15 +25,6 @@ bool GuestViewInternalCreateGuestFunction::RunAsync() {
   base::DictionaryValue* create_params;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params));
 
-  const PermissionsData* permissions_data = GetExtension()->permissions_data();
-  if (!permissions_data->HasAPIPermission(APIPermission::kWebView) &&
-      !permissions_data->HasAPIPermission(APIPermission::kAppView)) {
-    LOG(ERROR) << kPermissionRequiredError;
-    error_ = kPermissionRequiredError;
-    SendResponse(false);
-    return true;
-  }
-
   GuestViewManager* guest_view_manager =
       GuestViewManager::FromBrowserContext(browser_context());
 

chrome/browser/guest_view/app_view/app_view_guest.cc

@@ -21,6 +21,7 @@
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/api/app_runtime.h"
 #include "extensions/common/extension_messages.h"
+#include "extensions/common/permissions/permissions_data.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace app_runtime = extensions::core_api::app_runtime;
@@ -124,6 +125,19 @@ bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) {
   return true;
 }
 
+bool AppViewGuest::CanEmbedderUseGuestView(
+    const std::string& embedder_extension_id) {
+  Profile* profile = Profile::FromBrowserContext(browser_context());
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile)->extension_service();
+  const extensions::Extension* embedder_extension =
+      service->GetExtensionById(embedder_extension_id, false);
+  const extensions::PermissionsData* permissions_data =
+      embedder_extension->permissions_data();
+  return permissions_data->HasAPIPermission(
+      extensions::APIPermission::kAppView);
+}
+
 void AppViewGuest::CreateWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,

chrome/browser/guest_view/app_view/app_view_guest.h

@@ -47,6 +47,8 @@ class AppViewGuest : public GuestView<AppViewGuest>,
       const content::ContextMenuParams& params) OVERRIDE;
 
   // GuestViewBase implementation.
+  virtual bool CanEmbedderUseGuestView(
+      const std::string& embedder_extension_id) OVERRIDE;
   virtual void CreateWebContents(
       const std::string& embedder_extension_id,
       int embedder_render_process_id,

chrome/browser/guest_view/guest_view_base.cc

@@ -101,6 +101,11 @@ void GuestViewBase::Init(
     return;
   initialized_ = true;
 
+  if (!CanEmbedderUseGuestView(embedder_extension_id)) {
+    callback.Run(NULL);
+    return;
+  }
+
   CreateWebContents(embedder_extension_id,
                     embedder_render_process_id,
                     create_params,

chrome/browser/guest_view/guest_view_base.h

@@ -116,6 +116,12 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
   // to destruction.
   virtual void WillDestroy() {}
 
+  // This method is to be implemented by the derived class. It determines
+  // whether the guest view type of the derived class can be used by the
+  // provided embedder extension ID.
+  virtual bool CanEmbedderUseGuestView(
+      const std::string& embedder_extension_id) = 0;
+
   // This method is to be implemented by the derived class. Given a set of
   // initialization parameters, a concrete subclass of GuestViewBase can
   // create a specialized WebContents that it returns back to GuestViewBase.

chrome/browser/guest_view/web_view/web_view_guest.cc

@@ -11,6 +11,7 @@
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/api/web_view/web_view_internal_api.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/menu_manager.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
@@ -48,7 +49,9 @@
 #include "content/public/common/result_codes.h"
 #include "content/public/common/stop_find_action.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/browser/extension_system.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/permissions/permissions_data.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
@@ -228,6 +231,19 @@ scoped_ptr<base::ListValue> WebViewGuest::MenuModelToValue(
   return items.Pass();
 }
 
+bool WebViewGuest::CanEmbedderUseGuestView(
+    const std::string& embedder_extension_id) {
+  Profile* profile = Profile::FromBrowserContext(browser_context());
+  ExtensionService* service =
+      extensions::ExtensionSystem::Get(profile)->extension_service();
+  const extensions::Extension* embedder_extension =
+      service->GetExtensionById(embedder_extension_id, false);
+  const extensions::PermissionsData* permissions_data =
+      embedder_extension->permissions_data();
+  return permissions_data->HasAPIPermission(
+      extensions::APIPermission::kWebView);
+}
+
 void WebViewGuest::CreateWebContents(
     const std::string& embedder_extension_id,
     int embedder_render_process_id,
@@ -249,6 +265,7 @@ void WebViewGuest::CreateWebContents(
     base::KillProcess(
         embedder_render_process_host->GetHandle(),
         content::RESULT_CODE_KILLED_BAD_MESSAGE, false);
+    callback.Run(NULL);
     return;
   }
   std::string url_encoded_partition = net::EscapeQueryParamValue(

chrome/browser/guest_view/web_view/web_view_guest.h

@@ -83,6 +83,8 @@ class WebViewGuest : public GuestView<WebViewGuest>,
   void SetZoom(double zoom_factor);
 
   // GuestViewBase implementation.
+  virtual bool CanEmbedderUseGuestView(
+      const std::string& embedder_extension_id) OVERRIDE;
   virtual void CreateWebContents(
       const std::string& embedder_extension_id,
       int embedder_render_process_id,