Move broker creation out of PepperHelperImpl to PPB_Broker_Impl in the effort to eliminate PepperHe…

content/browser/web_contents/web_contents_impl.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 "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 2467 matching lines @@
 // This exists for render views that don't have a WebUI, but do have WebUI
 // bindings enabled.
 void WebContentsImpl::OnWebUISend(const GURL& source_url,
                                   const std::string& name,
                                   const base::ListValue& args) {
   if (delegate_)
     delegate_->WebUISend(this, source_url, name, args);
 }
 
 void WebContentsImpl::OnRequestPpapiBrokerPermission(
-    int request_id,
+    int routing_id,
     const GURL& url,
     const base::FilePath& plugin_path) {
   if (!delegate_) {
-    OnPpapiBrokerPermissionResult(request_id, false);
+    OnPpapiBrokerPermissionResult(routing_id, false);
     return;
   }
 
   if (!delegate_->RequestPpapiBrokerPermission(
       this, url, plugin_path,
       base::Bind(&WebContentsImpl::OnPpapiBrokerPermissionResult,
-                 base::Unretained(this), request_id))) {
+                 base::Unretained(this), routing_id))) {
     NOTIMPLEMENTED();
-    OnPpapiBrokerPermissionResult(request_id, false);
+    OnPpapiBrokerPermissionResult(routing_id, false);
   }
 }
 
-void WebContentsImpl::OnPpapiBrokerPermissionResult(int request_id,
+void WebContentsImpl::OnPpapiBrokerPermissionResult(int routing_id,
                                                     bool result) {
-  RenderViewHostImpl* rvh = GetRenderViewHostImpl();
-  rvh->Send(new ViewMsg_PpapiBrokerPermissionResult(rvh->GetRoutingID(),
-                                                    request_id,
-                                                    result));
+  Send(new ViewMsg_PpapiBrokerPermissionResult(routing_id, result));
 }
 
 void WebContentsImpl::OnBrowserPluginMessage(const IPC::Message& message) {
   // This creates a BrowserPluginEmbedder, which handles all the BrowserPlugin
   // specific messages for this WebContents. This means that any message from
   // a BrowserPlugin prior to this will be ignored.
   // For more info, see comment above classes BrowserPluginEmbedder and
   // BrowserPluginGuest.
   CHECK(!browser_plugin_embedder_.get());
   browser_plugin_embedder_.reset(BrowserPluginEmbedder::Create(this));
@@ skipping 1190 matching lines @@
 }
 
 void WebContentsImpl::ClearAllPowerSaveBlockers() {
   for (PowerSaveBlockerMap::iterator i(power_save_blockers_.begin());
        i != power_save_blockers_.end(); ++i)
     STLDeleteValues(&power_save_blockers_[i->first]);
   power_save_blockers_.clear();
 }
 
 }  // namespace content