Index: content/browser/browser_plugin/test_guest_manager_delegate.h |
diff --git a/content/browser/browser_plugin/test_guest_manager_delegate.h b/content/browser/browser_plugin/test_guest_manager_delegate.h |
index 9e5915c1d2a9521feeeb84b08914e82a7669a7d7..3adcee1a904b35728b259677ce5a60172f683f4e 100644 |
--- a/content/browser/browser_plugin/test_guest_manager_delegate.h |
+++ b/content/browser/browser_plugin/test_guest_manager_delegate.h |
@@ -12,6 +12,9 @@ |
namespace content { |
+class MessageLoopRunner; |
+class WebContentsImpl; |
+ |
// This class is temporary until BrowserPluginHostTest.* tests are entirely |
// moved out of content. |
class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate { |
@@ -24,6 +27,9 @@ class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate { |
void RemoveGuest(int guest_instance_id); |
SiteInstance* GetGuestSiteInstance(const GURL& guest_site); |
+ // Waits until at least one guest is added to this guest manager. |
+ WebContentsImpl* WaitForGuestAdded(); |
+ |
// BrowserPluginGuestManagerDelegate implementation. |
virtual content::WebContents* CreateGuest( |
content::SiteInstance* embedder_site_instance, |
@@ -42,11 +48,13 @@ class TestGuestManagerDelegate : public BrowserPluginGuestManagerDelegate { |
private: |
friend struct DefaultSingletonTraits<TestGuestManagerDelegate>; |
TestGuestManagerDelegate(); |
+ |
// Contains guests' WebContents, mapping from their instance ids. |
typedef std::map<int, WebContents*> GuestInstanceMap; |
GuestInstanceMap guest_web_contents_by_instance_id_; |
- |
+ WebContentsImpl* last_guest_added_; |
int next_instance_id_; |
+ scoped_refptr<MessageLoopRunner> message_loop_runner_; |
DISALLOW_COPY_AND_ASSIGN(TestGuestManagerDelegate); |
}; |