Implemented Browser Plugin (NOT FOR REVIEW)

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 5242ef92db0626124eb7cea778404662db492f2f..2dcbd7a332b99640542a1fb5f6bdaea8eac3cea1 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -14,7 +14,7 @@
 #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/browser_plugin/browser_plugin_host.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,9 +124,8 @@ 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();
+  content::BrowserPluginHost* browser_plugin_host() const {
+    return browser_plugin_host_.get();
   }
 
   // Like GetController from WebContents, but returns the concrete object.
@@ -147,6 +146,7 @@ class CONTENT_EXPORT WebContentsImpl
   virtual content::ViewType GetViewType() const OVERRIDE;
   virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
   virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE;
+  virtual content::RenderViewHost* GetPendingRenderViewHost() const OVERRIDE;
   virtual content::RenderWidgetHostView*
       GetRenderWidgetHostView() const OVERRIDE;
   virtual content::WebContentsView* GetView() const OVERRIDE;
@@ -594,8 +594,8 @@ class CONTENT_EXPORT WebContentsImpl
   scoped_ptr<JavaBridgeDispatcherHostManager>
       java_bridge_dispatcher_host_manager_;
 
-  scoped_ptr<content::BrowserPluginWebContentsObserver>
-      browser_plugin_web_contents_observer_;
+  scoped_ptr<content::BrowserPluginHost> browser_plugin_host_;
+
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;