Allow webview API in an unblessed extension process

chrome/browser/extensions/api/webview/webview_api.cc

 // 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/extensions/api/webview/webview_api.h"
 
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/common/extensions/api/webview.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/error_utils.h"
 
 using extensions::api::tabs::InjectDetails;
 namespace webview = extensions::api::webview;
@@ skipping 12 matching lines @@
     return content::StoragePartition::REMOVE_DATA_MASK_INDEXEDDB;
   if (strcmp(key, extension_browsing_data_api_constants::kLocalStorageKey) == 0)
     return content::StoragePartition::REMOVE_DATA_MASK_LOCAL_STORAGE;
   if (strcmp(key, extension_browsing_data_api_constants::kWebSQLKey) == 0)
     return content::StoragePartition::REMOVE_DATA_MASK_WEBSQL;
   return 0;
 }
 
 }  // namespace
 
+bool WebviewExtensionFunction::RunImpl() {
+  int instance_id = 0;
+  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &instance_id));
+  WebViewGuest* guest = WebViewGuest::From(
+      render_view_host()->GetProcess()->GetID(), instance_id);
+  if (!guest)
+    return false;
+
+  return RunImplSafe(guest);
+}
+
 WebviewClearDataFunction::WebviewClearDataFunction()
     : remove_mask_(0),
       bad_message_(false) {
 };
 
 WebviewClearDataFunction::~WebviewClearDataFunction() {
 };
 
 // Parses the |dataToRemove| argument to generate the remove mask. Sets
 // |bad_message_| (like EXTENSION_FUNCTION_VALIDATE would if this were a bool
@@ skipping 16 matching lines @@
     }
     if (selected)
       remove_mask |= MaskForKey(i.key().c_str());
   }
 
   return remove_mask;
 }
 
 // TODO(lazyboy): Parameters in this extension function are similar (or a
 // sub-set) to BrowsingDataRemoverFunction. How can we share this code?
-bool WebviewClearDataFunction::RunImpl() {
+bool WebviewClearDataFunction::RunImplSafe(WebViewGuest* guest) {
   content::RecordAction(content::UserMetricsAction("WebView.ClearData"));
-  int instance_id = 0;
-  EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &instance_id));
 
   // Grab the initial |options| parameter, and parse out the arguments.
   base::DictionaryValue* options;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &options));
   DCHECK(options);
 
   // If |ms_since_epoch| isn't set, default it to 0.
   double ms_since_epoch;
   if (!options->GetDouble(extension_browsing_data_api_constants::kSinceKey,
                           &ms_since_epoch)) {
     ms_since_epoch = 0;
   }
 
   // base::Time takes a double that represents seconds since epoch. JavaScript
   // gives developers milliseconds, so do a quick conversion before populating
   // the object. Also, Time::FromDoubleT converts double time 0 to empty Time
   // object. So we need to do special handling here.
   remove_since_ = (ms_since_epoch == 0) ?
       base::Time::UnixEpoch() :
       base::Time::FromDoubleT(ms_since_epoch / 1000.0);
 
   remove_mask_ = GetRemovalMask();
   if (bad_message_)
     return false;
 
-  WebViewGuest* guest = WebViewGuest::From(
-      render_view_host()->GetProcess()->GetID(), instance_id);
-  if (!guest)
-    return false;
-
   AddRef();  // Balanced below or in WebviewClearDataFunction::Done().
 
   bool scheduled = false;
   if (remove_mask_) {
     scheduled = guest->ClearData(
         remove_since_,
         remove_mask_,
         base::Bind(&WebviewClearDataFunction::ClearDataDone,
                    this));
   }
@@ skipping 82 matching lines @@
 bool WebviewInsertCSSFunction::ShouldInsertCSS() const {
   return true;
 }
 
 WebviewGoFunction::WebviewGoFunction() {
 }
 
 WebviewGoFunction::~WebviewGoFunction() {
 }
 
-bool WebviewGoFunction::RunImpl() {
+bool WebviewGoFunction::RunImplSafe(WebViewGuest* guest) {
   content::RecordAction(content::UserMetricsAction("WebView.Go"));
   scoped_ptr<webview::Go::Params> params(webview::Go::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  WebViewGuest* guest = WebViewGuest::From(
-      render_view_host()->GetProcess()->GetID(), params->instance_id);
-  if (!guest)
-    return false;
-
   guest->Go(params->relative_index);
   return true;
 }
 
 WebviewReloadFunction::WebviewReloadFunction() {
 }
 
 WebviewReloadFunction::~WebviewReloadFunction() {
 }
 
-bool WebviewReloadFunction::RunImpl() {
+bool WebviewReloadFunction::RunImplSafe(WebViewGuest* guest) {
   content::RecordAction(content::UserMetricsAction("WebView.Reload"));
   scoped_ptr<webview::Reload::Params> params(
       webview::Reload::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  WebViewGuest* guest = WebViewGuest::From(
-      render_view_host()->GetProcess()->GetID(), params->instance_id);
-  if (!guest)
-    return false;
-
   guest->Reload();
   return true;
 }
 
 WebviewSetPermissionFunction::WebviewSetPermissionFunction() {
 }
 
 WebviewSetPermissionFunction::~WebviewSetPermissionFunction() {
 }
 
-bool WebviewSetPermissionFunction::RunImpl() {
+bool WebviewSetPermissionFunction::RunImplSafe(WebViewGuest* guest) {
   scoped_ptr<webview::SetPermission::Params> params(
       webview::SetPermission::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  WebViewGuest* guest = WebViewGuest::From(
-      render_view_host()->GetProcess()->GetID(), params->instance_id);
-  if (!guest)
-    return false;
-
   EXTENSION_FUNCTION_VALIDATE(
       guest->SetPermission(params->request_id,
                            params->should_allow,
                            params->user_input));
   return true;
 }
 
 WebviewOverrideUserAgentFunction::WebviewOverrideUserAgentFunction() {
 }
 
@@ skipping 15 matching lines @@
   guest->SetUserAgentOverride(user_agent_override);
   return true;
 }
 
 WebviewStopFunction::WebviewStopFunction() {
 }
 
 WebviewStopFunction::~WebviewStopFunction() {
 }
 
-bool WebviewStopFunction::RunImpl() {
+bool WebviewStopFunction::RunImplSafe(WebViewGuest* guest) {
   content::RecordAction(content::UserMetricsAction("WebView.Stop"));
   scoped_ptr<webview::Stop::Params> params(
       webview::Stop::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  WebViewGuest* guest = WebViewGuest::From(
-      render_view_host()->GetProcess()->GetID(), params->instance_id);
-  if (!guest)
-    return false;
-
   guest->Stop();
   return true;
 }
 
 WebviewTerminateFunction::WebviewTerminateFunction() {
 }
 
 WebviewTerminateFunction::~WebviewTerminateFunction() {
 }
 
-bool WebviewTerminateFunction::RunImpl() {
+bool WebviewTerminateFunction::RunImplSafe(WebViewGuest* guest) {
   content::RecordAction(content::UserMetricsAction("WebView.Terminate"));
   scoped_ptr<webview::Terminate::Params> params(
       webview::Terminate::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  WebViewGuest* guest = WebViewGuest::From(
-      render_view_host()->GetProcess()->GetID(), params->instance_id);
-  if (!guest)
-    return false;
-
   guest->Terminate();
   return true;
 }
 
 }  // namespace extensions