BrowserPlugin: Move CreateGuest to chrome

chrome/browser/guest_view/guest_view_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 #define CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 
 #include <map>
 
 #include "base/lazy_instance.h"
@@ skipping 11 matching lines @@
 }  // namespace content
 
 class GuestViewManager : public content::BrowserPluginGuestManagerDelegate,
                          public base::SupportsUserData::Data {
  public:
   explicit GuestViewManager(content::BrowserContext* context);
   virtual ~GuestViewManager();
 
   static GuestViewManager* FromBrowserContext(content::BrowserContext* context);
 
+  void AddGuest(int guest_instance_id,

[lazyboy, 2014/05/02 19:52:52]

Description for added public methods.

[Fady Samuel, 2014/05/06 20:02:48]

Moved to private. These need to be accessed by GuestViewBase so I made that a
friend class.

+                content::WebContents* guest_web_contents);
+  void RemoveGuest(int guest_instance_id);
+
   content::WebContents* GetGuestByInstanceIDSafely(
       int guest_instance_id,
       int embedder_render_process_id);
   bool CanEmbedderAccessInstanceIDMaybeKill(
       int embedder_render_process_id,
       int guest_instance_id);
   bool CanEmbedderAccessInstanceID(int embedder_render_process_id,
                                    int guest_instance_id);
 
   // BrowserPluginGuestManagerDelegate implementation.
+  virtual content::WebContents* CreateGuest(
+      content::SiteInstance* embedder_site_instance,
+      int instance_id,
+      const content::StorageInfo& storage_info,
+      scoped_ptr<base::DictionaryValue> extra_params) OVERRIDE;
   virtual int GetNextInstanceID() OVERRIDE;
-  virtual void AddGuest(int guest_instance_id,
-                        content::WebContents* guest_web_contents) OVERRIDE;
-  virtual void RemoveGuest(int guest_instance_id) OVERRIDE;
   virtual void MaybeGetGuestByInstanceIDOrKill(
       int guest_instance_id,
       int embedder_render_process_id,
       const GuestByInstanceIDCallback& callback) OVERRIDE;
-  virtual content::SiteInstance* GetGuestSiteInstance(
-      const GURL& guest_site) OVERRIDE;
   virtual bool ForEachGuest(content::WebContents* embedder_web_contents,
                             const GuestCallback& callback) OVERRIDE;
 
  private:
   friend class GuestWebContentsObserver;
 
   void AddRenderProcessHostID(int render_process_host_id);
 
   content::WebContents* GetGuestByInstanceID(
       int guest_instance_id,
       int embedder_render_process_id);
 
+  content::SiteInstance* GetGuestSiteInstance(
+      const GURL& guest_site);
+
   static bool CanEmbedderAccessGuest(int embedder_render_process_id,
                                      GuestViewBase* guest);
 
   // Counts RenderProcessHost IDs of GuestViewBases.
   std::multiset<int> render_process_host_id_multiset_;
 
   // Contains guests' WebContents, mapping from their instance ids.
   typedef std::map<int, content::WebContents*> GuestInstanceMap;
   GuestInstanceMap guest_web_contents_by_instance_id_;
 
   int current_instance_id_;
   content::BrowserContext* context_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };
 
 #endif  // CHROME_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_