GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/test_guest_view_manager.cc

 // 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.
 
 #include "extensions/browser/guest_view/test_guest_view_manager.h"
 
 #include "base/callback.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/extension_host.h"
+#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/test/shell_test.h"
 #include "extensions/test/extension_test_message_listener.h"
 
+using guestview::GuestViewManagerDelegate;
+
 namespace extensions {
 
-TestGuestViewManager::TestGuestViewManager(content::BrowserContext* context)
-    : GuestViewManager(context) {
+TestGuestViewManager::TestGuestViewManager(
+    content::BrowserContext* context,
+    scoped_ptr<GuestViewManagerDelegate> delegate)
+    : GuestViewManager(context, delegate.Pass()) {
 }
 
 TestGuestViewManager::~TestGuestViewManager() {
 }
 
 int TestGuestViewManager::GetNumGuests() const {
   return guest_web_contents_by_instance_id_.size();
 }
 
 content::WebContents* TestGuestViewManager::GetLastGuestCreated() {
@@ skipping 43 matching lines @@
 
 // Test factory for creating test instances of GuestViewManager.
 TestGuestViewManagerFactory::TestGuestViewManagerFactory()
     : test_guest_view_manager_(NULL) {
 }
 
 TestGuestViewManagerFactory::~TestGuestViewManagerFactory() {
 }
 
 GuestViewManager* TestGuestViewManagerFactory::CreateGuestViewManager(
-    content::BrowserContext* context) {
-  return GetManager(context);
-}
-
-// This function gets called from GuestViewManager::FromBrowserContext(),
-// where test_guest_view_manager_ is assigned to a linked_ptr that takes care
-// of deleting it.
-TestGuestViewManager* TestGuestViewManagerFactory::GetManager(
-    content::BrowserContext* context) {
-  DCHECK(!test_guest_view_manager_);
-  test_guest_view_manager_ = new TestGuestViewManager(context);
+    content::BrowserContext* context,
+    scoped_ptr<guestview::GuestViewManagerDelegate> delegate) {
+  if (!test_guest_view_manager_) {
+    test_guest_view_manager_ =
+        new TestGuestViewManager(context, delegate.Pass());
+  }
   return test_guest_view_manager_;
 }
 
 }  // namespace extensions