4 files changed, 3 insertions, 7 deletions
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 0e2e2a3..8878a9a 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -387,7 +387,7 @@ class CONTENT_EXPORT ContentBrowserClient {
   // or denied immediately, and the callback won't be run.
   virtual void AllowCertificateError(
       int render_process_id,
-      int render_frame_id,
+      int render_view_id,
       int cert_error,
       const net::SSLInfo& ssl_info,
       const GURL& request_url,
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h
index e33b12d..3aaec7c 100644
--- a/content/public/browser/render_frame_host.h
+++ b/content/public/browser/render_frame_host.h
@@ -12,7 +12,6 @@
 
 namespace content {
 class RenderProcessHost;
-class RenderViewHost;
 class SiteInstance;
 
 // The interface provides a communication conduit with a frame in the renderer.
@@ -36,9 +35,6 @@ class CONTENT_EXPORT RenderFrameHost : public IPC::Listener,
   // Returns the associated widget's native view.
   virtual gfx::NativeView GetNativeView() = 0;
 
-  // Temporary until we get rid of RenderViewHost.
-  virtual RenderViewHost* GetRenderViewHost() = 0;
-
  private:
   // This interface should only be implemented inside content.
   friend class RenderFrameHostImpl;
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc
index 344cbe3..9ffc222 100644
--- a/content/public/renderer/content_renderer_client.cc
+++ b/content/public/renderer/content_renderer_client.cc
@@ -93,7 +93,7 @@ bool ContentRendererClient::AllowPopup() {
 
 #ifdef OS_ANDROID
 bool ContentRendererClient::HandleNavigation(
-    RenderFrame* render_frame,
+    RenderView* view,
     DocumentState* document_state,
     int opener_id,
     blink::WebFrame* frame,
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 958d1fa..e409afa 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -179,7 +179,7 @@ class CONTENT_EXPORT ContentRendererClient {
   //
   // Returns true if the navigation was handled by the embedder and should be
   // ignored by WebKit. This method is used by CEF and android_webview.
-  virtual bool HandleNavigation(RenderFrame* render_frame,
+  virtual bool HandleNavigation(RenderView* view,
                                 DocumentState* document_state,
                                 int opener_id,
                                 blink::WebFrame* frame,