Make PepperWebPlugin not use RenderViews.

chrome/browser/extensions/extension_function_dispatcher.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_function_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/result_codes.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_set.h"
@@ skipping 266 matching lines @@
       iter = ui_thread_response_callback_wrappers_.find(render_view_host);
   UIThreadResponseCallbackWrapper* callback_wrapper = NULL;
   if (iter == ui_thread_response_callback_wrappers_.end()) {
     callback_wrapper = new UIThreadResponseCallbackWrapper(AsWeakPtr(),
                                                            render_view_host);
     ui_thread_response_callback_wrappers_[render_view_host] = callback_wrapper;
   } else {
     callback_wrapper = iter->second;
   }
 
-  DispatchWithCallback(params, render_view_host,
-                       callback_wrapper->CreateCallback(params.request_id));
+  DispatchWithCallbackInternal(
+      params, render_view_host, NULL,
+      callback_wrapper->CreateCallback(params.request_id));
 }
 
 void ExtensionFunctionDispatcher::DispatchWithCallback(
     const ExtensionHostMsg_Request_Params& params,
+    content::RenderFrameHost* render_frame_host,
+    const ExtensionFunction::ResponseCallback& callback) {
+  DispatchWithCallbackInternal(params, NULL, render_frame_host, callback);
+}
+
+void ExtensionFunctionDispatcher::DispatchWithCallbackInternal(
+    const ExtensionHostMsg_Request_Params& params,
     RenderViewHost* render_view_host,

[nasko, 2013/12/20 14:53:54]

nit: prefix RVH with content, so it is consistent with RFH below.

[jam, 2013/12/20 17:00:49]

the background is when I started content refactoring I put "using content::" foo
in a lot of places. I now regret that, and I'm trying not to do that with
RenderFrameHost.

+    content::RenderFrameHost* render_frame_host,
     const ExtensionFunction::ResponseCallback& callback) {
+  DCHECK(render_view_host || render_frame_host);
   // TODO(yzshen): There is some shared logic between this method and
   // DispatchOnIOThread(). It is nice to deduplicate.
   ExtensionSystem* extension_system =
       ExtensionSystem::GetForBrowserContext(browser_context_);
   ExtensionService* service = extension_system->extension_service();
   extensions::ProcessMap* process_map = service->process_map();
   if (!process_map)
     return;
 
   const Extension* extension = service->extensions()->GetByID(
       params.extension_id);
   if (!extension)
     extension = service->extensions()->GetHostedAppByURL(params.source_url);
 
+  int process_id = render_view_host ? render_view_host->GetProcess()->GetID() :
+                                      render_frame_host->GetProcess()->GetID();
   scoped_refptr<ExtensionFunction> function(
       CreateExtensionFunction(params,
                               extension,
-                              render_view_host->GetProcess()->GetID(),
+                              process_id,
                               *process_map,
                               extensions::ExtensionAPI::GetSharedInstance(),
                               browser_context_,
                               callback));
   scoped_ptr<ListValue> args(params.arguments.DeepCopy());
 
   if (!function.get())
     return;
 
   UIThreadExtensionFunction* function_ui =
       function->AsUIThreadExtensionFunction();
   if (!function_ui) {
     NOTREACHED();
     return;
   }
-  function_ui->SetRenderViewHost(render_view_host);
+  if (render_view_host) {
+    function_ui->SetRenderViewHost(render_view_host);
+  } else {
+    function_ui->SetRenderFrameHost(render_frame_host);
+  }
   function_ui->set_dispatcher(AsWeakPtr());
   function_ui->set_context(browser_context_);
   function->set_include_incognito(extension_util::CanCrossIncognito(extension,
                                                                     service));
 
   if (!CheckPermissions(function.get(), extension, params, callback))
     return;
 
   extensions::QuotaService* quota = service->quota_service();
   std::string violation_error = quota->Assess(extension->id(),
@@ skipping 127 matching lines @@
   return function;
 }
 
 // static
 void ExtensionFunctionDispatcher::SendAccessDenied(
     const ExtensionFunction::ResponseCallback& callback) {
   ListValue empty_list;
   callback.Run(ExtensionFunction::FAILED, empty_list,
                "Access to extension API denied.");
 }