Commit 0496c21c authored by John Abd-El-Malek's avatar John Abd-El-Malek Committed by Commit Bot

Override SetUpOnMainThread instead of PreRunTestOnMainThread in two weblayer browertests.

Per the comments in BrowserTestBase, PreRunTestOnMainThread is meant to be inherited just by test harnesses.

Change-Id: I8e3e0e20589219f4a1561ca194ea3d73c7378b2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980983Reviewed-by: default avatarClark DuVall <cduvall@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#728003}
parent ba6b634e
...@@ -79,8 +79,7 @@ class SafeBrowsingBrowserTest : public WebLayerBrowserTest { ...@@ -79,8 +79,7 @@ class SafeBrowsingBrowserTest : public WebLayerBrowserTest {
~SafeBrowsingBrowserTest() override = default; ~SafeBrowsingBrowserTest() override = default;
// WebLayerBrowserTest: // WebLayerBrowserTest:
void PreRunTestOnMainThread() override { void SetUpOnMainThread() override {
WebLayerBrowserTest::PreRunTestOnMainThread();
NavigateAndWaitForCompletion(GURL("about:blank"), shell()); NavigateAndWaitForCompletion(GURL("about:blank"), shell());
safe_browsing::SafeBrowsingApiHandler::SetInstance(fake_handler_.get()); safe_browsing::SafeBrowsingApiHandler::SetInstance(fake_handler_.get());
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
......
...@@ -24,9 +24,7 @@ class SSLBrowserTest : public WebLayerBrowserTest { ...@@ -24,9 +24,7 @@ class SSLBrowserTest : public WebLayerBrowserTest {
~SSLBrowserTest() override = default; ~SSLBrowserTest() override = default;
// WebLayerBrowserTest: // WebLayerBrowserTest:
void PreRunTestOnMainThread() override { void SetUpOnMainThread() override {
WebLayerBrowserTest::PreRunTestOnMainThread();
https_server_ = std::make_unique<net::EmbeddedTestServer>( https_server_ = std::make_unique<net::EmbeddedTestServer>(
net::EmbeddedTestServer::TYPE_HTTPS); net::EmbeddedTestServer::TYPE_HTTPS);
https_server_->AddDefaultHandlers( https_server_->AddDefaultHandlers(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment