Browser Plugin: Removed BrowserPluginWebContentsObserver (to be replaced by rewritten BrowserPlugi…

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 934ad7a50463b22c8b8c717ebe9aae80efcf21e2..7e726ad65a6a628cf9e5b41d9f8c3af002d54979 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -14,7 +14,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/property_bag.h"
-#include "content/browser/browser_plugin/browser_plugin_web_contents_observer.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/render_view_host_manager.h"
@@ -124,17 +123,16 @@ class CONTENT_EXPORT WebContentsImpl
     return java_bridge_dispatcher_host_manager_.get();
   }
 
-  content::BrowserPluginWebContentsObserver*
-      browser_plugin_web_contents_observer() const {
-    return browser_plugin_web_contents_observer_.get();
-  }
-
   // Like GetController from WebContents, but returns the concrete object.
   NavigationControllerImpl& GetControllerImpl();
 
   // Expose the render manager for testing.
   RenderViewHostManager* GetRenderManagerForTesting();
 
+  // Expose the pending RenderViewHost for use by Browser Plugin cross-process
+  // navigation.
+  content::RenderViewHost* GetPendingRenderViewHost() const;
+
   // content::WebContents ------------------------------------------------------
   virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
   virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
@@ -588,8 +586,6 @@ class CONTENT_EXPORT WebContentsImpl
   scoped_ptr<JavaBridgeDispatcherHostManager>
       java_bridge_dispatcher_host_manager_;
 
-  scoped_ptr<content::BrowserPluginWebContentsObserver>
-      browser_plugin_web_contents_observer_;
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;