Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 08b4da90632f4172e3b296c674525ac3b568a2ab..7d13791c8beaae1d94274163889890c60cccda35 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -1426,7 +1426,9 @@ void WebContentsImpl::CreateNewWindow( |
} else { |
// This makes |new_contents| act as a guest. |
// For more info, see comment above class BrowserPluginGuest. |
- int instance_id = GetBrowserPluginGuestManager()->get_next_instance_id(); |
+ int instance_id = |
+ BrowserPluginGuestManager::FromBrowserContext(GetBrowserContext())-> |
+ GetNextInstanceID(); |
WebContentsImpl* new_contents_impl = |
static_cast<WebContentsImpl*>(new_contents); |
BrowserPluginGuest::CreateWithOpener(instance_id, |
@@ -3949,13 +3951,6 @@ BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const { |
return browser_plugin_embedder_.get(); |
} |
-BrowserPluginGuestManager* |
- WebContentsImpl::GetBrowserPluginGuestManager() const { |
- return static_cast<BrowserPluginGuestManager*>( |
- GetBrowserContext()->GetUserData( |
- browser_plugin::kBrowserPluginGuestManagerKeyName)); |
-} |
- |
void WebContentsImpl::ClearPowerSaveBlockers( |
RenderFrameHost* render_frame_host) { |
STLDeleteValues(&power_save_blockers_[render_frame_host]); |