GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc

 // Copyright 2013 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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.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/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"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 using extensions::AppWindow;
-
-class TestGuestViewManager : public extensions::GuestViewManager {
- public:
-  explicit TestGuestViewManager(content::BrowserContext* context)
-      : GuestViewManager(context),
-        guest_add_count_(0),
-        guest_remove_count_(0),
-        web_contents_(NULL) {}
-
-  content::WebContents* WaitForGuestAdded() {
-    if (web_contents_)
-      return web_contents_;
-
-    add_message_loop_runner_ = new content::MessageLoopRunner;
-    add_message_loop_runner_->Run();
-    return web_contents_;
-  }
-
-  // Waits so that at least |expected_remove_count| guests' creation
-  // has been seen by this manager.
-  void WaitForGuestRemoved(size_t expected_remove_count) {
-    if (guest_remove_count_ >= expected_remove_count)
-      return;
-
-    remove_message_loop_runner_ = new content::MessageLoopRunner;
-    remove_message_loop_runner_->Run();
-  }
-
-  size_t guest_add_count() { return guest_add_count_; }
-
- private:
-  // GuestViewManager override:
-  void AddGuest(int guest_instance_id,
-                content::WebContents* guest_web_contents) override {
-    GuestViewManager::AddGuest(guest_instance_id, guest_web_contents);
-    web_contents_ = guest_web_contents;
-    ++guest_add_count_;
-
-    if (add_message_loop_runner_.get())
-      add_message_loop_runner_->Quit();
-  }
-
-  void RemoveGuest(int guest_instance_id) override {
-    GuestViewManager::RemoveGuest(guest_instance_id);
-    ++guest_remove_count_;
-
-    if (remove_message_loop_runner_.get())
-      remove_message_loop_runner_->Quit();
-  }
-
-  size_t guest_add_count_;
-  size_t guest_remove_count_;
-  content::WebContents* web_contents_;
-  scoped_refptr<content::MessageLoopRunner> add_message_loop_runner_;
-  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);
-};
+using extensions::ExtensionsGuestViewManagerDelegate;
+using extensions::GuestViewManager;
+using extensions::TestGuestViewManager;
 
 class WebViewInteractiveTest
     : public extensions::PlatformAppBrowserTest {
  public:
   WebViewInteractiveTest()
       : guest_web_contents_(NULL),
         embedder_web_contents_(NULL),
         corner_(gfx::Point()),
         mouse_click_result_(false),
         first_click_(true) {
     extensions::GuestViewManager::set_factory_for_testing(&factory_);
   }
 
+  void RunTestOnMainThreadLoop() override {
+    extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
+    GetGuestViewManager()->WaitForAllGuestsDeleted();

[Fady Samuel, 2015/04/24 01:31:24]

Note to self: browser() may be undefined at this point. Get rid of this

[Fady Samuel, 2015/04/24 04:37:48]

Done.

+  }
+
   TestGuestViewManager* GetGuestViewManager() {
-    return factory_.GetManager(browser()->profile());
+    TestGuestViewManager* manager = static_cast<TestGuestViewManager*>(
+        TestGuestViewManager::FromBrowserContext(browser()->profile()));
+    // TestGuestViewManager::WaitForSingleGuestCreated may and will get called
+    // before a guest is created.
+    if (!manager) {
+      manager = static_cast<TestGuestViewManager*>(
+          GuestViewManager::CreateWithDelegate(
+              browser()->profile(),
+              scoped_ptr<guestview::GuestViewManagerDelegate>(
+                  new ExtensionsGuestViewManagerDelegate(
+                      browser()->profile()))));
+    }
+    return manager;
   }
 
   void MoveMouseInsideWindowWithListener(gfx::Point point,
                                          const std::string& message) {
     ExtensionTestMessageListener move_listener(message, false);
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
         gfx::Point(corner_.x() + point.x(), corner_.y() + point.y())));
     ASSERT_TRUE(move_listener.WaitUntilSatisfied());
   }
 
@@ skipping 133 matching lines @@
                   const std::string& app_location,
                   TestServer test_server) {
     content::WebContents* embedder_web_contents = NULL;
     scoped_ptr<ExtensionTestMessageListener> done_listener(
         RunAppHelper(
             test_name, app_location, test_server, &embedder_web_contents));
 
     ASSERT_TRUE(done_listener);
     ASSERT_TRUE(done_listener->WaitUntilSatisfied());
 
-    guest_web_contents_ = GetGuestViewManager()->WaitForGuestAdded();
+    guest_web_contents_ = GetGuestViewManager()->WaitForSingleGuestCreated();
   }
 
-  void RunTest(const std::string& app_name) {
-  }
   void SetupTest(const std::string& app_name,
                  const std::string& guest_url_spec) {
     ASSERT_TRUE(StartEmbeddedTestServer());
     GURL::Replacements replace_host;
     replace_host.SetHostStr("localhost");
 
     GURL guest_url = embedded_test_server()->GetURL(guest_url_spec);
     guest_url = guest_url.ReplaceComponents(replace_host);
 
     ui_test_utils::UrlLoadObserver guest_observer(
@@ skipping 238 matching lines @@
         "FULLSCREEN_STEP_PASSED", false);
     passed_listener.set_failure_message("TEST_FAILED");
     content::SimulateMouseClickAt(guest_web_contents(),
                                   0,
                                   blink::WebMouseEvent::ButtonLeft,
                                   gfx::Point(20, 20));
     ASSERT_TRUE(passed_listener.WaitUntilSatisfied());
   }
 
  protected:
-  TestGuestViewManagerFactory factory_;
+  extensions::TestGuestViewManagerFactory factory_;
   content::WebContents* guest_web_contents_;
   content::WebContents* embedder_web_contents_;
   gfx::Point corner_;
   bool mouse_click_result_;
   bool first_click_;
   // Only used in drag/drop test.
   base::Closure quit_closure_;
   std::string last_drop_data_;
 };
 
@@ skipping 332 matching lines @@
   // Wait for the embedder to receive a 'newwindow' event.
   ASSERT_TRUE(done_listener->WaitUntilSatisfied());
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest,
                        NewWindow_OpenerDestroyedWhileUnattached) {
   TestHelper("testNewWindowOpenerDestroyedWhileUnattached",
              "web_view/newwindow",
              NEEDS_TEST_SERVER);
-  ASSERT_EQ(2u, GetGuestViewManager()->guest_add_count());
+  ASSERT_EQ(2, GetGuestViewManager()->num_guests_created());
 
   // We have two guests in this test, one is the intial one, the other
   // is the newwindow one.
   // Before the embedder goes away, both the guests should go away.
   // This ensures that unattached guests are gone if opener is gone.
-  GetGuestViewManager()->WaitForGuestRemoved(2u);
+  GetGuestViewManager()->WaitForAllGuestsDeleted();
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, ExecuteCode) {
   ASSERT_TRUE(RunPlatformAppTestWithArg(
       "platform_apps/web_view/common", "execute_code")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, PopupPositioningBasic) {
   TestHelper("testBasic", "web_view/popup_positioning", NO_TEST_SERVER);
   ASSERT_TRUE(guest_web_contents());
@@ skipping 291 matching lines @@
 
   // Now verify that the selection text propagates properly to RWHV.
   content::RenderWidgetHostView* guest_rwhv =
       guest_web_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(guest_rwhv);
   std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText());
   ASSERT_TRUE(selected_text.size() >= 10u);
   ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10));
 }
 #endif