Fix mojo startup

content/browser/webui/web_ui_mojo_browsertest.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 <limits>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 297 matching lines @@
   }
 
   TestWebUIControllerFactory* factory() { return &factory_; }
 
  private:
   TestWebUIControllerFactory factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest);
 };
 
-// Temporarily disabled due to flakiness on Windows. http://crbug.com/366644
-#if defined(OS_WIN)
-#define MAYBE_EndToEndPing DISABLED_EndToEndPing
-#define MAYBE_EndToEndEcho DISABLED_EndToEndEcho
-#else
-#define MAYBE_EndToEndPing EndToEndPing
-#define MAYBE_EndToEndEcho EndToEndEcho
-#endif
-
 // Loads a webui page that contains mojo bindings and verifies a message makes
 // it from the browser to the page and back.
-IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) {
+IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndPing) {
   // Currently there is no way to have a generated file included in the isolate
   // files. If the bindings file doesn't exist assume we're on such a bot and
   // pass.
   // TODO(sky): remove this conditional when isolates support copying from gen.
   const base::FilePath test_file_path(
       mojo::test::GetFilePathForJSResource(
           "content/test/data/web_ui_test_mojo_bindings.mojom"));
   if (!base::PathExists(test_file_path)) {
     LOG(WARNING) << " mojom binding file doesn't exist, assuming on isolate";
     return;
   }
 
   got_message = false;
   ASSERT_TRUE(test_server()->Start());
   base::RunLoop run_loop;
   factory()->set_run_loop(&run_loop);
   GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?ping"));
   NavigateToURL(shell(), test_url);
   // RunLoop is quit when message received from page.
   run_loop.Run();
   EXPECT_TRUE(got_message);
 }
 
 // Loads a webui page that contains mojo bindings and verifies that
 // parameters are passed back correctly from JavaScript.
-IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndEcho) {
+IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndEcho) {
   // Currently there is no way to have a generated file included in the isolate
   // files. If the bindings file doesn't exist assume we're on such a bot and
   // pass.
   // TODO(sky): remove this conditional when isolates support copying from gen.
   const base::FilePath test_file_path(
       mojo::test::GetFilePathForJSResource(
           "content/test/data/web_ui_test_mojo_bindings.mojom"));
   if (!base::PathExists(test_file_path)) {
     LOG(WARNING) << " mojom binding file doesn't exist, assuming on isolate";
     return;
   }
 
   message_count = 0;
   ASSERT_TRUE(test_server()->Start());
   base::RunLoop run_loop;
   factory()->set_run_loop(&run_loop);
   GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?echo"));
   NavigateToURL(shell(), test_url);
   // RunLoop is quit when response received from page.
   run_loop.Run();
   EXPECT_EQ(kExpectedMessageCount, message_count);
 }
 
 }  // namespace
 }  // namespace content