Move calling of shared browser test methods like SetUpOnMainThread/TearDownOnMainThread/RunTestOn...

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 <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 11 matching lines @@
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/api/extensions_api_client.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/process_manager.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_paths.h"
 #include "extensions/common/switches.h"
+#include "extensions/shell/browser/desktop_controller.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"
 #include "net/base/filename_util.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"
 #include "ui/display/display_switches.h"
 
@@ skipping 126 matching lines @@
 
   ExtensionTestMessageListener done_listener("TEST_PASSED", false);
   done_listener.set_failure_message("TEST_FAILED");
   ASSERT_TRUE(content::ExecuteScript(
       embedder_web_contents_,
       base::StringPrintf("runTest('%s')", test_name.c_str())))
       << "Unable to start test.";
   ASSERT_TRUE(done_listener.WaitUntilSatisfied());
 }
 
-void WebViewAPITest::RunTestOnMainThreadLoop() {
-  AppShellTest::RunTestOnMainThreadLoop();
-  GetGuestViewManager()->WaitForAllGuestsDeleted();
-}
-
 void WebViewAPITest::SetUpCommandLine(base::CommandLine* command_line) {
   AppShellTest::SetUpCommandLine(command_line);
   command_line->AppendSwitchASCII(::switches::kJavaScriptFlags, "--expose-gc");
 }
 
 void WebViewAPITest::SetUpOnMainThread() {
   AppShellTest::SetUpOnMainThread();
 
   TestGetConfigFunction::set_test_config_state(&test_config_);
   base::FilePath test_data_dir;
@@ skipping 36 matching lines @@
   embedded_test_server()->StartAcceptingConnections();
 }
 
 void WebViewAPITest::StopTestServer() {
   if (!embedded_test_server()->ShutdownAndWaitUntilComplete()) {
     LOG(ERROR) << "Failed to shutdown test server.";
   }
 }
 
 void WebViewAPITest::TearDownOnMainThread() {
+  DesktopController::instance()->CloseAppWindows();
+  GetGuestViewManager()->WaitForAllGuestsDeleted();
   TestGetConfigFunction::set_test_config_state(nullptr);
 
   AppShellTest::TearDownOnMainThread();
 }
 
 void WebViewAPITest::SendMessageToEmbedder(const std::string& message) {
   EXPECT_TRUE(
       content::ExecuteScript(
           GetEmbedderWebContents(),
           base::StringPrintf("onAppCommand('%s');", message.c_str())));
@@ skipping 516 matching lines @@
 // This test verifies that webview.contentWindow works inside an iframe
 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestWebViewInsideFrame) {
   LaunchApp("web_view/inside_iframe");
 }
 
 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestCaptureVisibleRegion) {
   RunTest("testCaptureVisibleRegion", "web_view/apitest");
 }
 
 }  // namespace extensions