Renable weblayer_browsertests on Windows.

This isn't flaking locally on the same build (Windows 10 Debug 64 bit) or on the same trybot as that waterfall bot. Trying to reland to see if it still flakes on that one bot.

TBR=loyso@chromium.org

Bug: 1026523
Change-Id: I69f346e74454904f629958c6f5006c9a66da9bf6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1935158
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719311}

weblayer/browser/errorpage_browsertest.cc

@@ -5,7 +5,6 @@
 #include "weblayer/test/weblayer_browser_test.h"
 
 #include "base/macros.h"
-#include "build/build_config.h"
 #include "net/test/url_request/url_request_failed_job.h"
 #include "weblayer/shell/browser/shell.h"
 #include "weblayer/test/weblayer_browser_test_utils.h"
@@ -17,16 +16,9 @@
 
 namespace weblayer {
 
-// TODO(crbug.com/1026523): Fix flakiness on Win10.
-#if defined(OS_WIN)
-#define MAYBE_ErrorPageBrowserTest DISABLED_ErrorPageBrowserTest
-#else
-#define MAYBE_ErrorPageBrowserTest ErrorPageBrowserTest
-#endif
-
-using MAYBE_ErrorPageBrowserTest = WebLayerBrowserTest;
+using ErrorPageBrowserTest = WebLayerBrowserTest;
 
-IN_PROC_BROWSER_TEST_F(MAYBE_ErrorPageBrowserTest, NameNotResolved) {
+IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, NameNotResolved) {
   GURL error_page_url =
       net::URLRequestFailedJob::GetMockHttpUrl(net::ERR_NAME_NOT_RESOLVED);
 
@@ -42,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_ErrorPageBrowserTest, NameNotResolved) {
 
 // Verifies that navigating to a URL that returns a 404 with an empty body
 // results in the navigation failing.
-IN_PROC_BROWSER_TEST_F(MAYBE_ErrorPageBrowserTest, 404WithEmptyBody) {
+IN_PROC_BROWSER_TEST_F(ErrorPageBrowserTest, 404WithEmptyBody) {
   EXPECT_TRUE(embedded_test_server()->Start());
 
   GURL error_page_url = embedded_test_server()->GetURL("/empty404.html");

weblayer/browser/navigation_browsertest.cc

@@ -5,7 +5,6 @@
 #include "weblayer/test/weblayer_browser_test.h"
 
 #include "base/files/file_path.h"
-#include "build/build_config.h"
 #include "content/public/test/url_loader_interceptor.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "weblayer/public/navigation.h"
@@ -66,16 +65,9 @@ class OneShotNavigationObserver : public NavigationObserver {
 
 }  // namespace
 
-// TODO(crbug.com/1026523): Fix flakiness on Win10.
-#if defined(OS_WIN)
-#define MAYBE_NavigationBrowserTest DISABLED_NavigationBrowserTest
-#else
-#define MAYBE_NavigationBrowserTest NavigationBrowserTest
-#endif
+using NavigationBrowserTest = WebLayerBrowserTest;
 
-using MAYBE_NavigationBrowserTest = WebLayerBrowserTest;
-
-IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, NoError) {
+IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, NoError) {
   EXPECT_TRUE(embedded_test_server()->Start());
 
   OneShotNavigationObserver observer(shell());
@@ -90,7 +82,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, NoError) {
   EXPECT_EQ(observer.navigation_state(), NavigationState::kComplete);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, HttpClientError) {
+IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, HttpClientError) {
   EXPECT_TRUE(embedded_test_server()->Start());
 
   OneShotNavigationObserver observer(shell());
@@ -105,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, HttpClientError) {
   EXPECT_EQ(observer.navigation_state(), NavigationState::kComplete);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, HttpServerError) {
+IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, HttpServerError) {
   EXPECT_TRUE(embedded_test_server()->Start());
 
   OneShotNavigationObserver observer(shell());
@@ -120,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, HttpServerError) {
   EXPECT_EQ(observer.navigation_state(), NavigationState::kComplete);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, SSLError) {
+IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, SSLError) {
   net::EmbeddedTestServer https_server_mismatched(
       net::EmbeddedTestServer::TYPE_HTTPS);
   https_server_mismatched.SetSSLConfig(
@@ -141,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, SSLError) {
   EXPECT_EQ(observer.navigation_state(), NavigationState::kFailed);
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_NavigationBrowserTest, HttpConnectivityError) {
+IN_PROC_BROWSER_TEST_F(NavigationBrowserTest, HttpConnectivityError) {
   GURL url("http://doesntexist.com/foo");
   auto interceptor = content::URLLoaderInterceptor::SetupRequestFailForURL(
       url, net::ERR_NAME_NOT_RESOLVED);

weblayer/browser/ssl_browsertest.cc

@@ -7,7 +7,6 @@
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/optional.h"
-#include "build/build_config.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "weblayer/shell/browser/shell.h"
 #include "weblayer/test/interstitial_utils.h"
@@ -15,19 +14,12 @@
 #include "weblayer/test/test_navigation_observer.h"
 #include "weblayer/test/weblayer_browser_test_utils.h"
 
-// TODO(crbug.com/1026523): Fix flakiness on Win10.
-#if defined(OS_WIN)
-#define MAYBE_SSLBrowserTest DISABLED_SSLBrowserTest
-#else
-#define MAYBE_SSLBrowserTest SSLBrowserTest
-#endif
-
 namespace weblayer {
 
-class MAYBE_SSLBrowserTest : public WebLayerBrowserTest {
+class SSLBrowserTest : public WebLayerBrowserTest {
  public:
-  MAYBE_SSLBrowserTest() = default;
-  ~MAYBE_SSLBrowserTest() override = default;
+  SSLBrowserTest() = default;
+  ~SSLBrowserTest() override = default;
 
   // WebLayerBrowserTest:
   void PreRunTestOnMainThread() override {
@@ -131,11 +123,11 @@ class MAYBE_SSLBrowserTest : public WebLayerBrowserTest {
   std::unique_ptr<net::EmbeddedTestServer> https_server_mismatched_;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MAYBE_SSLBrowserTest);
+  DISALLOW_COPY_AND_ASSIGN(SSLBrowserTest);
 };
 
 // Tests clicking "take me back" on the interstitial page.
-IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, TakeMeBack) {
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, TakeMeBack) {
   NavigateToOkPage();
   NavigateToPageWithSslErrorExpectBlocked();
 
@@ -152,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, TakeMeBack) {
 
 // Tests clicking "take me back" on the interstitial page when there's no
 // navigation history. The user should be taken to a safe page (about:blank).
-IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, TakeMeBackEmptyNavigationHistory) {
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, TakeMeBackEmptyNavigationHistory) {
   NavigateToPageWithSslErrorExpectBlocked();
 
   // Click "Take me back".
@@ -160,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, TakeMeBackEmptyNavigationHistory) {
                                            GURL("about:blank"));
 }
 
-IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, Reload) {
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, Reload) {
   NavigateToOkPage();
   NavigateToPageWithSslErrorExpectBlocked();
 
@@ -180,7 +172,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, Reload) {
 // Tests clicking proceed link on the interstitial page. This is a PRE_ test
 // because it also acts as setup for the test below which verifies the behavior
 // across restarts.
-IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, PRE_Proceed) {
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, PRE_Proceed) {
   NavigateToOkPage();
   NavigateToPageWithSslErrorExpectBlocked();
   SendInterstitialNavigationCommandAndWait(true /*proceed*/);
@@ -194,12 +186,12 @@ IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, PRE_Proceed) {
 // The proceed decision is not perpetuated across WebLayer sessions, i.e.
 // WebLayer will block again when navigating to the same bad page that was
 // previously proceeded through.
-IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, Proceed) {
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, Proceed) {
   NavigateToPageWithSslErrorExpectBlocked();
 }
 
 // Tests navigating away from the interstitial page.
-IN_PROC_BROWSER_TEST_F(MAYBE_SSLBrowserTest, NavigateAway) {
+IN_PROC_BROWSER_TEST_F(SSLBrowserTest, NavigateAway) {
   NavigateToOkPage();
   NavigateToPageWithSslErrorExpectBlocked();
   NavigateToOtherOkPage();

weblayer/browser/webui/webui_browsertest.cc

@@ -4,21 +4,13 @@
 
 #include "weblayer/test/weblayer_browser_test.h"
 
-#include "build/build_config.h"
 #include "weblayer/test/weblayer_browser_test_utils.h"
 
-// TODO(crbug.com/1026523): Fix flakiness on Win10.
-#if defined(OS_WIN)
-#define MAYBE_WebLayerWebUIBrowserTest DISABLED_WebLayerWebUIBrowserTest
-#else
-#define MAYBE_WebLayerWebUIBrowserTest WebLayerWebUIBrowserTest
-#endif
-
 namespace weblayer {
 
-using MAYBE_WebLayerWebUIBrowserTest = WebLayerBrowserTest;
+using WebLayerWebUIBrowserTest = WebLayerBrowserTest;
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebLayerWebUIBrowserTest, WebUI) {
+IN_PROC_BROWSER_TEST_F(WebLayerWebUIBrowserTest, WebUI) {
   NavigateAndWaitForCompletion(GURL("chrome://weblayer"), shell());
   base::RunLoop run_loop;
   bool result =

weblayer/test/weblayer_browser_test_test.cc

@@ -4,22 +4,12 @@
 
 #include "weblayer/test/weblayer_browser_test.h"
 
-#include "build/build_config.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "weblayer/test/weblayer_browser_test_utils.h"
 
-// TODO(crbug.com/1026523): Fix flakiness on Win10.
-#if defined(OS_WIN)
-#define MAYBE_WebLayerBrowserTest DISABLED_WebLayerBrowserTest
-#else
-#define MAYBE_WebLayerBrowserTest WebLayerBrowserTest
-#endif
-
 namespace weblayer {
 
-using MAYBE_WebLayerBrowserTest = WebLayerBrowserTest;
-
-IN_PROC_BROWSER_TEST_F(MAYBE_WebLayerBrowserTest, Basic) {
+IN_PROC_BROWSER_TEST_F(WebLayerBrowserTest, Basic) {
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url = embedded_test_server()->GetURL("/simple_page.html");