Towards moving guest management to chrome: Introduce GuestViewManager

content/browser/browser_plugin/browser_plugin_embedder.h

Index: content/browser/browser_plugin/browser_plugin_embedder.h
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.h b/content/browser/browser_plugin/browser_plugin_embedder.h
index e153a4df79af4261254b35a25c6d26489f907092..cbbe3eac551d792bd869441c1d5379365bb9ffca 100644
--- a/content/browser/browser_plugin/browser_plugin_embedder.h
+++ b/content/browser/browser_plugin/browser_plugin_embedder.h
@@ -86,9 +86,7 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
  private:
   friend class TestBrowserPluginEmbedder;
 
-  BrowserPluginEmbedder(WebContentsImpl* web_contents);
-
-  BrowserPluginGuestManager* GetBrowserPluginGuestManager();
+  explicit BrowserPluginEmbedder(WebContentsImpl* web_contents);
 
   bool DidSendScreenRectsCallback(BrowserPluginGuest* guest);
 
@@ -97,9 +95,11 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
   bool UnlockMouseIfNecessaryCallback(const NativeWebKeyboardEvent& event,
                                       BrowserPluginGuest* guest);
 
+  void AllocateInstanceIDResponse(int request_id, int instance_id);
+
   // Message handlers.
 
-  void OnAllocateInstanceID(int request_id);
+  void OnAllocateInstanceID(int request_id, const std::string& src);
   void OnAttach(int instance_id,
                 const BrowserPluginHostMsg_Attach_Params& params,
                 const base::DictionaryValue& extra_params);
@@ -121,6 +121,8 @@ class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
   // status messages to the correct guest.
   base::WeakPtr<BrowserPluginGuest> guest_started_drag_;
 
+  base::WeakPtrFactory<BrowserPluginEmbedder> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
 };