GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc

Index: chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
index 89a60997976470f8c1fc120b2984a3ea84c76637..5860c7e0fa29b67162618f5f0ddc44c27cca454a 100644
--- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
@@ -23,9 +23,11 @@
 #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/guest_view/extensions_guest_view_manager_delegate.h"
 #include "extensions/browser/guest_view/guest_view_base.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/guest_view/guest_view_manager_factory.h"
+#include "extensions/browser/guest_view/test_guest_view_manager.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/ime/composition_text.h"
@@ -37,8 +39,9 @@ using extensions::AppWindow;
 
 class TestGuestViewManager : public extensions::GuestViewManager {
  public:
-  explicit TestGuestViewManager(content::BrowserContext* context)
-      : GuestViewManager(context),
+  TestGuestViewManager(content::BrowserContext* context,
+                       scoped_ptr<guestview::GuestViewManagerDelegate> delegate)
+      : GuestViewManager(context, delegate.Pass()),
         guest_add_count_(0),
         guest_remove_count_(0),
         web_contents_(NULL) {}
@@ -91,32 +94,6 @@ class TestGuestViewManager : public extensions::GuestViewManager {
   scoped_refptr<content::MessageLoopRunner> remove_message_loop_runner_;
 };
 
-// Test factory for creating test instances of GuestViewManager.
-class TestGuestViewManagerFactory : public extensions::GuestViewManagerFactory {
- public:
-  TestGuestViewManagerFactory() :
-      test_guest_view_manager_(NULL) {}
-
-  ~TestGuestViewManagerFactory() override {}
-
-  extensions::GuestViewManager* CreateGuestViewManager(
-      content::BrowserContext* context) override {
-    return GetManager(context);
-  }
-
-  TestGuestViewManager* GetManager(content::BrowserContext* context) {
-    if (!test_guest_view_manager_) {
-      test_guest_view_manager_ = new TestGuestViewManager(context);
-    }
-    return test_guest_view_manager_;
-  }
-
- private:
-  TestGuestViewManager* test_guest_view_manager_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestGuestViewManagerFactory);
-};
-
 class WebViewInteractiveTest
     : public extensions::PlatformAppBrowserTest {
  public:
@@ -130,7 +107,8 @@ class WebViewInteractiveTest
   }
 
   TestGuestViewManager* GetGuestViewManager() {
-    return factory_.GetManager(browser()->profile());
+    return static_cast<TestGuestViewManager*>(
+        extensions::GuestViewManager::FromBrowserContext(browser()->profile()));
   }
 
   void MoveMouseInsideWindowWithListener(gfx::Point point,
@@ -547,7 +525,7 @@ class WebViewInteractiveTest
   }
 
  protected:
-  TestGuestViewManagerFactory factory_;
+  extensions::TestGuestViewManagerFactory factory_;
   content::WebContents* guest_web_contents_;
   content::WebContents* embedder_web_contents_;
   gfx::Point corner_;