Make PepperWebPlugin not use RenderViews.

chrome/browser/renderer_host/pepper/pepper_talk_host.cc

Index: chrome/browser/renderer_host/pepper/pepper_talk_host.cc
===================================================================
--- chrome/browser/renderer_host/pepper/pepper_talk_host.cc	(revision 242033)
+++ chrome/browser/renderer_host/pepper/pepper_talk_host.cc	(working copy)
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_frame_host.h"
 #include "grit/generated_resources.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
@@ -31,15 +31,15 @@
 ppapi::host::ReplyMessageContext GetPermissionOnUIThread(
     PP_TalkPermission permission,
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   reply.params.set_result(0);
 
-  content::RenderViewHost* render_view_host =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!render_view_host)
-    return reply;  // RVH destroyed while task was pending.
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  if (!render_frame_host)
+    return reply;  // RFH destroyed while task was pending.
 
 #if defined(USE_ASH)
   base::string16 title;
@@ -91,14 +91,14 @@
 ppapi::host::ReplyMessageContext StartRemotingOnUIThread(
     const base::Closure& stop_callback,
     int render_process_id,
-    int render_view_id,
+    int render_frame_id,
     ppapi::host::ReplyMessageContext reply) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  content::RenderViewHost* render_view_host =
-      content::RenderViewHost::FromID(render_process_id, render_view_id);
-  if (!render_view_host) {
+  content::RenderFrameHost* render_frame_host =
+      content::RenderFrameHost::FromID(render_process_id, render_frame_id);
+  if (!render_frame_host) {
     reply.params.set_result(PP_ERROR_FAILED);
-    return reply;  // RVH destroyed while task was pending.
+    return reply;  // RFH destroyed while task was pending.
   }
 
 #if defined(USE_ASH) && defined(OS_CHROMEOS)
@@ -175,14 +175,14 @@
     return PP_ERROR_BADARGUMENT;
 
   int render_process_id = 0;
-  int render_view_id = 0;
-  browser_ppapi_host_->GetRenderViewIDsForInstance(
-      pp_instance(), &render_process_id, &render_view_id);
+  int render_frame_id = 0;
+  browser_ppapi_host_->GetRenderFrameIDsForInstance(
+      pp_instance(), &render_process_id, &render_frame_id);
 
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&GetPermissionOnUIThread, permission, render_process_id,
-                 render_view_id, context->MakeReplyMessageContext()),
+                 render_frame_id, context->MakeReplyMessageContext()),
       base::Bind(&PepperTalkHost::OnRequestPermissionCompleted,
                  weak_factory_.GetWeakPtr()));
   return PP_OK_COMPLETIONPENDING;
@@ -191,9 +191,9 @@
 int32_t PepperTalkHost::OnStartRemoting(
     ppapi::host::HostMessageContext* context) {
   int render_process_id = 0;
-  int render_view_id = 0;
-  browser_ppapi_host_->GetRenderViewIDsForInstance(
-      pp_instance(), &render_process_id, &render_view_id);
+  int render_frame_id = 0;
+  browser_ppapi_host_->GetRenderFrameIDsForInstance(
+      pp_instance(), &render_process_id, &render_frame_id);
 
   base::Closure remoting_stop_callback = base::Bind(
       &PepperTalkHost::OnRemotingStopEvent,
@@ -202,7 +202,7 @@
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartRemotingOnUIThread, remoting_stop_callback,
-                 render_process_id, render_view_id,
+                 render_process_id, render_frame_id,
                  context->MakeReplyMessageContext()),
       base::Bind(&PepperTalkHost::OnStartRemotingCompleted,
                  weak_factory_.GetWeakPtr()));