GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

extensions/browser/guest_view/web_view/web_view_apitest.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/web_view/web_view_apitest.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/api/test/test_api.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/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/browser/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/shell/browser/shell_content_browser_client.h"
 #include "extensions/shell/browser/shell_extension_system.h"
 #include "extensions/shell/test/shell_test.h"
 #include "extensions/test/extension_test_message_listener.h"
@@ skipping 200 matching lines @@
           base::StringPrintf("onAppCommand('%s');", message.c_str())));
 }
 
 content::WebContents* WebViewAPITest::GetEmbedderWebContents() {
   if (!embedder_web_contents_)
     embedder_web_contents_ = GetFirstAppWindowWebContents();
   return embedder_web_contents_;
 }
 
 TestGuestViewManager* WebViewAPITest::GetGuestViewManager() {
-  return static_cast<TestGuestViewManager*>(
-      TestGuestViewManager::FromBrowserContext(
-          ShellContentBrowserClient::Get()->GetBrowserContext()));
+  content::BrowserContext* context =
+      ShellContentBrowserClient::Get()->GetBrowserContext();
+  TestGuestViewManager* manager = static_cast<TestGuestViewManager*>(
+      TestGuestViewManager::FromBrowserContext(context));
+  // TestGuestViewManager::WaitForSingleGuestCreated may and will get called
+  // before a guest is created.
+  if (!manager) {
+    manager = static_cast<TestGuestViewManager*>(
+        GuestViewManager::CreateWithDelegate(
+            context,
+            scoped_ptr<guestview::GuestViewManagerDelegate>(
+                new ExtensionsGuestViewManagerDelegate(context))));
+  }
+  return manager;
 }
 
 void WebViewAPITest::SendMessageToGuestAndWait(
     const std::string& message,
     const std::string& wait_message) {
   scoped_ptr<ExtensionTestMessageListener> listener;
   if (!wait_message.empty())
     listener.reset(new ExtensionTestMessageListener(wait_message, false));
 
   EXPECT_TRUE(
@@ skipping 104 matching lines @@
 #if defined(OS_WIN)
 #define MAYBE_CloseOnLoadcommit DISABLED_CloseOnLoadcommit
 #else
 #define MAYBE_CloseOnLoadcommit CloseOnLoadcommit
 #endif
 IN_PROC_BROWSER_TEST_F(WebViewAPITest, MAYBE_CloseOnLoadcommit) {
   LaunchApp("web_view/close_on_loadcommit");
   ExtensionTestMessageListener test_done_listener("done-close-on-loadcommit",
                                                   false);
   ASSERT_TRUE(test_done_listener.WaitUntilSatisfied());
+  fprintf(stderr, ">>%s\n", __PRETTY_FUNCTION__);

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

Note to self: Delete this.

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

Done.

 }
 
 // This test verifies that reloading the embedder reloads the guest (and doest
 // not crash).
 IN_PROC_BROWSER_TEST_F(WebViewAPITest, ReloadEmbedder) {
   // Just load a guest from other test, we do not want to add a separate
   // app for this test.
   LaunchApp("web_view/visibility_changed");
 
   ExtensionTestMessageListener launched_again_listener("LAUNCHED", false);
@@ skipping 330 matching lines @@
   RunTest("testWebRequestAPIGoogleProperty", "web_view/apitest");
 }
 
 // This test verifies that webview.contentWindow works inside an iframe
 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebViewInsideFrame) {
   LaunchApp("web_view/inside_iframe");
 }
 
 
 }  // namespace extensions