Index: content/browser/browser_plugin/test_browser_plugin_guest_delegate.h |
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest_delegate.h b/content/browser/browser_plugin/test_browser_plugin_guest_delegate.h |
index 607e574f9aaaf61635f36578e9fb6b66f787f868..594f768cbf8ce18818586cc48824c8fd3c4c8011 100644 |
--- a/content/browser/browser_plugin/test_browser_plugin_guest_delegate.h |
+++ b/content/browser/browser_plugin/test_browser_plugin_guest_delegate.h |
@@ -8,6 +8,7 @@ |
#include "content/public/browser/browser_plugin_guest_delegate.h" |
#include "base/callback.h" |
+#include "content/public/browser/web_contents_observer.h" |
#include "content/public/common/page_transition_types.h" |
#include "url/gurl.h" |
@@ -16,26 +17,34 @@ namespace content { |
class BrowserPluginGuest; |
struct Referrer; |
-class TestBrowserPluginGuestDelegate : public BrowserPluginGuestDelegate { |
+class TestBrowserPluginGuestDelegate : public BrowserPluginGuestDelegate, |
+ public WebContentsObserver { |
public: |
explicit TestBrowserPluginGuestDelegate(BrowserPluginGuest* guest); |
virtual ~TestBrowserPluginGuestDelegate(); |
- void ResetStates(); |
+ WebContents* GetEmbedderWebContents() const; |
private: |
+ class EmbedderWebContentsObserver; |
+ |
void LoadURLWithParams(const GURL& url, |
const Referrer& referrer, |
PageTransition transition_type, |
WebContents* web_contents); |
+ // WebContentsObserver implementation. |
+ virtual void WebContentsDestroyed() OVERRIDE; |
+ |
// Overridden from BrowserPluginGuestDelegate: |
+ virtual void DidAttach() OVERRIDE; |
virtual void Destroy() OVERRIDE; |
virtual void NavigateGuest(const std::string& src) OVERRIDE; |
virtual void RegisterDestructionCallback( |
const DestructionCallback& callback) OVERRIDE; |
BrowserPluginGuest* guest_; |
+ scoped_ptr<EmbedderWebContentsObserver> embedder_web_contents_observer_; |
DestructionCallback destruction_callback_; |