Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1020)

Unified Diff: content/browser/browser_plugin/test_browser_plugin_guest_manager.h

Issue 261013005: BrowserPlugin: Move CreateGuest to chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@guestview_manager_simplify_api
Patch Set: Fixed content_browsertests after a change Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_plugin/test_browser_plugin_guest_manager.h
diff --git a/content/browser/browser_plugin/test_browser_plugin_guest_manager.h b/content/browser/browser_plugin/test_browser_plugin_guest_manager.h
index 227eed48557a106b023ab8b17b4bb8ff9e34490f..cb5da410b2930adfc988d333545e56869eac3835 100644
--- a/content/browser/browser_plugin/test_browser_plugin_guest_manager.h
+++ b/content/browser/browser_plugin/test_browser_plugin_guest_manager.h
@@ -25,6 +25,14 @@ class TestBrowserPluginGuestManager : public BrowserPluginGuestManager {
explicit TestBrowserPluginGuestManager(BrowserContext* context);
virtual ~TestBrowserPluginGuestManager();
+ // Overriden to intercept in test.
+ virtual BrowserPluginGuest* CreateGuest(
+ SiteInstance* embedder_site_instance,
+ int instance_id,
+ const std::string& storage_partition_id,
+ bool persist_storage,
+ scoped_ptr<base::DictionaryValue> extra_params) OVERRIDE;
+
// Waits until at least one guest is added to the guest manager.
WebContents* WaitForGuestAdded();
@@ -32,10 +40,6 @@ class TestBrowserPluginGuestManager : public BrowserPluginGuestManager {
// BrowserPluginHostTest.ReloadEmbedder needs access to the GuestInstanceMap.
FRIEND_TEST_ALL_PREFIXES(BrowserPluginHostTest, ReloadEmbedder);
- // Overriden to intercept in test.
- virtual void AddGuest(int instance_id,
- WebContents* guest_web_contents) OVERRIDE;
-
WebContents* last_guest_added_;
scoped_refptr<MessageLoopRunner> message_loop_runner_;
DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginGuestManager);

Powered by Google App Engine
This is Rietveld 408576698