Moved guest_view_registry to GuestViewManager and made it an instance map

extensions/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 EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_
 
 #include <map>
 
+#include "base/bind.h"
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 
 class GURL;
 
 namespace content {
@@ skipping 44 matching lines @@
 
   // Removes the association between |element_instance_id| and a guest instance
   // ID if one exists.
   void DetachGuest(GuestViewBase* guest);
 
   int GetNextInstanceID();
   int GetGuestInstanceIDForElementID(
       int owner_process_id,
       int element_instance_id);
 
+  template <typename T>
+  void RegisterGuestViewType() {
+    auto it = guest_view_registry_.find(T::Type);
+    DCHECK(it == guest_view_registry_.end());
+    guest_view_registry_[T::Type] = base::Bind(&T::Create);
+  }
+
   using WebContentsCreatedCallback =
       base::Callback<void(content::WebContents*)>;
   void CreateGuest(const std::string& view_type,
                    content::WebContents* owner_web_contents,
                    const base::DictionaryValue& create_params,
                    const WebContentsCreatedCallback& callback);
 
   content::WebContents* CreateGuestWithWebContentsParams(
       const std::string& view_type,
       content::WebContents* owner_web_contents,
@@ skipping 13 matching lines @@
   friend class GuestViewBase;
   FRIEND_TEST_ALL_PREFIXES(GuestViewManagerTest, AddRemove);
 
   // Can be overriden in tests.
   virtual void AddGuest(int guest_instance_id,
                         content::WebContents* guest_web_contents);
 
   // Can be overriden in tests.
   virtual void RemoveGuest(int guest_instance_id);
 
+  // Create a guest of the provided |view_type|.

[lazyboy, 2015/04/20 19:08:57]

Creates

[Fady Samuel, 2015/04/20 20:35:23]

Done.

+  GuestViewBase* CreateGuestInternal(content::WebContents* owner_web_contents,
+                                     const std::string& view_type);
+
+  // Adds GuestView types to the GuestView registry.
+  void RegisterGuestViewTypes();
+
   // Indicates whether the provided |guest| can be used in the context it has
   // been created.
   bool IsGuestAvailableToContext(GuestViewBase* guest,
                                  std::string* owner_extension_id);
 
   content::WebContents* GetGuestByInstanceID(int guest_instance_id);
 
   bool CanEmbedderAccessInstanceIDMaybeKill(
       int embedder_render_process_id,
       int guest_instance_id);
@@ skipping 26 matching lines @@
     bool operator==(const ElementInstanceKey& other) const;
   };
 
   using GuestInstanceIDMap = std::map<ElementInstanceKey, int>;
   GuestInstanceIDMap instance_id_map_;
 
   // The reverse map of GuestInstanceIDMap.
   using GuestInstanceIDReverseMap = std::map<int, ElementInstanceKey>;
   GuestInstanceIDReverseMap reverse_instance_id_map_;
 
+  using GuestCreationCallback =
+      base::Callback<GuestViewBase*(content::WebContents*)>;
+  using GuestViewCreationMap =
+      std::map<std::string, GuestViewManager::GuestCreationCallback>;
+  GuestViewCreationMap guest_view_registry_;
+
   int current_instance_id_;
 
   // Any instance ID whose number not greater than this was removed via
   // RemoveGuest.
   // This is used so that we don't have store all removed instance IDs in
   // |removed_instance_ids_|.
   int last_instance_id_removed_;
   // The remaining instance IDs that are greater than
   // |last_instance_id_removed_| are kept here.
   std::set<int> removed_instance_ids_;
 
   content::BrowserContext* context_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewManager);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_MANAGER_H_