Getting rid of more webview memory leaks.

components/guest_view/browser/test_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 COMPONENTS_GUEST_VIEW_BROWSER_TEST_GUEST_VIEW_MANAGER_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_TEST_GUEST_VIEW_MANAGER_H_
 
 #include "base/memory/linked_ptr.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/guest_view/browser/guest_view_manager_factory.h"
@@ skipping 18 matching lines @@
   content::WebContents* GetLastGuestCreated();
 
   // Returns the number of guests currently still alive at the time of calling
   // this method.
   size_t GetNumGuestsActive() const;
 
   // Returns the size of the set of removed instance IDs.
   size_t GetNumRemovedInstanceIDs() const;
 
   using GuestViewCreateFunction =
-      base::Callback<GuestViewBase*(content::WebContents*)>;;
+      base::Callback<GuestViewBase*(content::WebContents*)>;
 
   template <typename T>
-  void RegisterTestGuestViewType(GuestViewCreateFunction create_function) {
-    guest_view_registry_[T::Type] = create_function;
+  void RegisterTestGuestViewType(
+      const GuestViewCreateFunction& create_function) {
+    auto registry_entry = std::make_pair(
+        T::Type,
+        GuestViewData(create_function, base::Bind(&T::CleanUp)));
+    guest_view_registry_.insert(registry_entry);
   }
 
   // Returns the number of guests that have been created since the creation of
   // this GuestViewManager.
   int num_guests_created() const { return num_guests_created_; }
 
   // Returns the number of GuestViews that have been garbage collected in
   // JavaScript since the creation of this GuestViewManager.
   int num_views_garbage_collected() const {
     return num_views_garbage_collected_;
@@ skipping 43 matching lines @@
 
  private:
   TestGuestViewManager* test_guest_view_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory);
 };
 
 }  // namespace guest_view
 
 #endif  // COMPONENTS_GUEST_VIEW_BROWSER_TEST_GUEST_VIEW_MANAGER_H_