[fuchsia] Remove unnecessary ScopedRunTimeouts.

These tests all make use of either base::test::TaskEnvironment or
content::BrowserTestBase (via the WebEngineBrowserTest helper), which
already set default ScopedRunTimeouts.

Bug: 1021777
Change-Id: Ifbc5c29fb7dc1380c1d97bf6a49ff71c02b7e7df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020642
Auto-Submit: Wez <wez@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735101}

fuchsia/engine/browser/content_directory_browsertest.cc

@@ -13,8 +13,6 @@
 #include "base/fuchsia/file_utils.h"
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/path_service.h"
-#include "base/test/bind_test_util.h"
-#include "base/test/test_timeouts.h"
 #include "base/threading/thread_restrictions.h"
 #include "fuchsia/base/frame_test_util.h"
 #include "fuchsia/base/test_navigation_listener.h"
@@ -58,9 +56,7 @@ void ServePseudoDir(base::StringPiece name, vfs::PseudoDir* dir) {
 
 class ContentDirectoryTest : public cr_fuchsia::WebEngineBrowserTest {
  public:
-  ContentDirectoryTest()
-      : run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)) {}
+  ContentDirectoryTest() = default;
   ~ContentDirectoryTest() override = default;
 
   void SetUp() override {
@@ -107,9 +103,6 @@ class ContentDirectoryTest : public cr_fuchsia::WebEngineBrowserTest {
 
   cr_fuchsia::TestNavigationListener navigation_listener_;
 
- private:
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
-
   DISALLOW_COPY_AND_ASSIGN(ContentDirectoryTest);
 };
 

fuchsia/engine/browser/frame_impl_browsertest.cc

@@ -10,8 +10,6 @@
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/bind_test_util.h"
-#include "base/test/test_timeouts.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
@@ -97,9 +95,7 @@ std::string StringFromMemBufferOrDie(const fuchsia::mem::Buffer& buffer) {
 // navigation commands and page events.
 class FrameImplTest : public cr_fuchsia::WebEngineBrowserTest {
  public:
-  FrameImplTest()
-      : run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)) {
+  FrameImplTest() {
     set_test_server_root(base::FilePath(cr_fuchsia::kTestServerRoot));
   }
 
@@ -116,9 +112,6 @@ class FrameImplTest : public cr_fuchsia::WebEngineBrowserTest {
 
   cr_fuchsia::TestNavigationListener navigation_listener_;
 
- private:
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
-
   DISALLOW_COPY_AND_ASSIGN(FrameImplTest);
 };
 

fuchsia/engine/browser/media_browsertest.cc

@@ -5,8 +5,6 @@
 #include "fuchsia/engine/test/web_engine_browser_test.h"
 
 #include "base/files/file_path.h"
-#include "base/test/bind_test_util.h"
-#include "base/test/test_timeouts.h"
 #include "fuchsia/base/frame_test_util.h"
 #include "fuchsia/base/test_navigation_listener.h"
 #include "fuchsia/engine/switches.h"
@@ -17,9 +15,7 @@ namespace {
 
 class MediaTest : public cr_fuchsia::WebEngineBrowserTest {
  public:
-  MediaTest()
-      : run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)) {
+  MediaTest() {
     set_test_server_root(base::FilePath(cr_fuchsia::kTestServerRoot));
   }
   ~MediaTest() override = default;
@@ -37,9 +33,6 @@ class MediaTest : public cr_fuchsia::WebEngineBrowserTest {
 
   cr_fuchsia::TestNavigationListener navigation_listener_;
 
- private:
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
-
   DISALLOW_COPY_AND_ASSIGN(MediaTest);
 };
 

fuchsia/runners/cast/api_bindings_client_browsertest.cc

@@ -6,7 +6,6 @@
 #include <lib/fidl/cpp/binding.h>
 
 #include "base/test/bind_test_util.h"
-#include "base/test/test_timeouts.h"
 #include "fuchsia/base/fit_adapter.h"
 #include "fuchsia/base/frame_test_util.h"
 #include "fuchsia/base/mem_buffer_util.h"
@@ -21,10 +20,7 @@ namespace {
 
 class ApiBindingsClientTest : public cr_fuchsia::WebEngineBrowserTest {
  public:
-  ApiBindingsClientTest()
-      : api_service_binding_(&api_service_),
-        run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)) {
+  ApiBindingsClientTest() : api_service_binding_(&api_service_) {
     set_test_server_root(base::FilePath("fuchsia/runners/cast/testdata"));
   }
 
@@ -68,9 +64,6 @@ class ApiBindingsClientTest : public cr_fuchsia::WebEngineBrowserTest {
   cr_fuchsia::TestNavigationListener navigation_listener_;
   fuchsia::web::NavigationControllerPtr controller_;
 
- private:
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
-
   DISALLOW_COPY_AND_ASSIGN(ApiBindingsClientTest);
 };
 

fuchsia/runners/cast/application_controller_impl_unittest.cc

@@ -9,9 +9,7 @@
 #include <utility>
 
 #include "base/logging.h"
-#include "base/test/bind_test_util.h"
 #include "base/test/task_environment.h"
-#include "base/test/test_timeouts.h"
 #include "fuchsia/base/fit_adapter.h"
 #include "fuchsia/fidl/chromium/cast/cpp/fidl.h"
 #include "fuchsia/runners/cast/application_controller_impl.h"
@@ -36,9 +34,7 @@ class ApplicationControllerImplTest
       public testing::Test {
  public:
   ApplicationControllerImplTest()
-      : run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)),
-        application_receiver_binding_(this),
+      : application_receiver_binding_(this),
         application_(&frame_, application_receiver_binding_.NewBinding()) {
     base::RunLoop run_loop;
     wait_for_controller_callback_ = run_loop.QuitClosure();
@@ -58,7 +54,6 @@ class ApplicationControllerImplTest
     std::move(wait_for_controller_callback_).Run();
   }
 
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
   base::test::SingleThreadTaskEnvironment task_environment_{
       base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
 

fuchsia/runners/cast/cast_runner_integration_test.cc

@@ -18,7 +18,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/test/bind_test_util.h"
 #include "base/test/task_environment.h"
-#include "base/test/test_timeouts.h"
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "fuchsia/base/agent_impl.h"
 #include "fuchsia/base/fake_component_context.h"
@@ -234,10 +233,7 @@ class CastRunnerIntegrationTest : public testing::Test {
 
  protected:
   explicit CastRunnerIntegrationTest(
-      fuchsia::web::ContextFeatureFlags feature_flags)
-      : run_timeout_(
-            TestTimeouts::action_timeout(),
-            base::MakeExpectedNotRunClosure(FROM_HERE, "Run() timed out.")) {
+      fuchsia::web::ContextFeatureFlags feature_flags) {
     // Create the CastRunner, published into |outgoing_directory_|.
     fuchsia::web::CreateContextParams create_context_params;
     create_context_params.set_features(feature_flags);
@@ -284,7 +280,6 @@ class CastRunnerIntegrationTest : public testing::Test {
         &component_services_, component_url);
   }
 
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
   base::test::SingleThreadTaskEnvironment task_environment_{
       base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
   net::EmbeddedTestServer test_server_;

fuchsia/runners/cast/named_message_port_connector_browsertest.cc

@@ -9,8 +9,6 @@
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
-#include "base/test/bind_test_util.h"
-#include "base/test/test_timeouts.h"
 #include "base/threading/thread_restrictions.h"
 #include "fuchsia/base/fit_adapter.h"
 #include "fuchsia/base/frame_test_util.h"
@@ -26,9 +24,7 @@
 
 class NamedMessagePortConnectorTest : public cr_fuchsia::WebEngineBrowserTest {
  public:
-  NamedMessagePortConnectorTest()
-      : run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)) {
+  NamedMessagePortConnectorTest() {
     set_test_server_root(base::FilePath("fuchsia/runners/cast/testdata"));
     navigation_listener_.SetBeforeAckHook(
         base::BindRepeating(&NamedMessagePortConnectorTest::OnBeforeAckHook,
@@ -66,9 +62,6 @@ class NamedMessagePortConnectorTest : public cr_fuchsia::WebEngineBrowserTest {
   std::unique_ptr<NamedMessagePortConnector> connector_;
   cr_fuchsia::TestNavigationListener navigation_listener_;
 
- private:
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
-
   DISALLOW_COPY_AND_ASSIGN(NamedMessagePortConnectorTest);
 };
 

fuchsia/runners/web/web_runner_smoke_test.cc

@@ -11,9 +11,7 @@
 #include "base/fuchsia/default_context.h"
 #include "base/fuchsia/scoped_service_binding.h"
 #include "base/fuchsia/service_provider_impl.h"
-#include "base/test/bind_test_util.h"
 #include "base/test/task_environment.h"
-#include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
@@ -28,9 +26,7 @@ namespace {
 
 class WebRunnerSmokeTest : public testing::Test {
  public:
-  WebRunnerSmokeTest()
-      : run_timeout_(TestTimeouts::action_timeout(),
-                     base::MakeExpectedNotRunClosure(FROM_HERE)) {}
+  WebRunnerSmokeTest() = default;
   void SetUp() final {
     test_server_.RegisterRequestHandler(base::BindRepeating(
         &WebRunnerSmokeTest::HandleRequest, base::Unretained(this)));
@@ -82,8 +78,6 @@ class WebRunnerSmokeTest : public testing::Test {
   }
 
  protected:
-  const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
-
   bool test_html_requested_ = false;
   bool test_image_requested_ = false;