GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/test_guest_view_manager.cc

Index: extensions/browser/guest_view/test_guest_view_manager.cc
diff --git a/extensions/browser/guest_view/test_guest_view_manager.cc b/extensions/browser/guest_view/test_guest_view_manager.cc
index ce7b12525bae6dff2f2fa04c46d2f98f35e359c4..cd9867d7c5ec4b1656a3f815337da7178780eaed 100644
--- a/extensions/browser/guest_view/test_guest_view_manager.cc
+++ b/extensions/browser/guest_view/test_guest_view_manager.cc
@@ -10,6 +10,7 @@
 #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"
@@ -17,10 +18,14 @@
 #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() {
@@ -84,17 +89,12 @@ 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_;
 }