GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

chrome/browser/apps/guest_view/app_view_browsertest.cc

Index: chrome/browser/apps/guest_view/app_view_browsertest.cc
diff --git a/chrome/browser/apps/guest_view/app_view_browsertest.cc b/chrome/browser/apps/guest_view/app_view_browsertest.cc
index 8ddc15d7d40942de10f6b32c8146a387422f5cc2..432323f11534cb0104eb5c88b187faa9948d9496 100644
--- a/chrome/browser/apps/guest_view/app_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/app_view_browsertest.cc
@@ -8,85 +8,22 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
+#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"

[Fady Samuel, 2015/04/23 03:44:52]

Note to self: This can be removed.

[Fady Samuel, 2015/04/24 00:11:31]

Done.

 #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/common/switches.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 
-namespace {
-
-class TestGuestViewManager : public extensions::GuestViewManager {
- public:
-  explicit TestGuestViewManager(content::BrowserContext* context) :
-      extensions::GuestViewManager(context),
-      web_contents_(NULL) {}
-
-  content::WebContents* WaitForGuestCreated() {
-    if (web_contents_)
-      return web_contents_;
-
-    message_loop_runner_ = new content::MessageLoopRunner;
-    message_loop_runner_->Run();
-    return web_contents_;
-  }
-
- private:
-  // GuestViewManager override:
-  void AddGuest(int guest_instance_id,
-                content::WebContents* guest_web_contents) override {
-    extensions::GuestViewManager::AddGuest(
-        guest_instance_id, guest_web_contents);
-    web_contents_ = guest_web_contents;
-
-    if (message_loop_runner_.get())
-      message_loop_runner_->Quit();
-  }
-
-  content::WebContents* web_contents_;
-  scoped_refptr<content::MessageLoopRunner> 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);
-};
-
-}  // namespace
-
 class AppViewTest : public extensions::PlatformAppBrowserTest {
  public:
   AppViewTest() {
     extensions::GuestViewManager::set_factory_for_testing(&factory_);
   }
 
-  TestGuestViewManager* GetGuestViewManager() {
-    return factory_.GetManager(browser()->profile());
-  }
-
   enum TestServer {
     NEEDS_TEST_SERVER,
     NO_TEST_SERVER
@@ -134,7 +71,7 @@ class AppViewTest : public extensions::PlatformAppBrowserTest {
     extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
   }
 
-  TestGuestViewManagerFactory factory_;
+  extensions::TestGuestViewManagerFactory factory_;
 };
 
 // Tests that <appview> is able to navigate to another installed app.