| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 | 287 |
| 288 TestWebUIControllerFactory* factory() { return &factory_; } | 288 TestWebUIControllerFactory* factory() { return &factory_; } |
| 289 | 289 |
| 290 private: | 290 private: |
| 291 TestWebUIControllerFactory factory_; | 291 TestWebUIControllerFactory factory_; |
| 292 | 292 |
| 293 DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest); | 293 DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest); |
| 294 }; | 294 }; |
| 295 | 295 |
| 296 // Temporarily disabled due to memory leaks. http://crbug.com/360081 | 296 // Temporarily disabled due to memory leaks. http://crbug.com/360081 |
| 297 #if defined(LEAK_SANITIZER) | 297 // Temporarily disabled due to flakiness on Windows. http://crbug.com/366644 |
| 298 #if defined(LEAK_SANITIZER) || defined(OS_WIN) |
| 298 #define MAYBE_EndToEndPing DISABLED_EndToEndPing | 299 #define MAYBE_EndToEndPing DISABLED_EndToEndPing |
| 299 #define MAYBE_EndToEndEcho DISABLED_EndToEndEcho | 300 #define MAYBE_EndToEndEcho DISABLED_EndToEndEcho |
| 300 #else | 301 #else |
| 301 #define MAYBE_EndToEndPing EndToEndPing | 302 #define MAYBE_EndToEndPing EndToEndPing |
| 302 #define MAYBE_EndToEndEcho EndToEndEcho | 303 #define MAYBE_EndToEndEcho EndToEndEcho |
| 303 #endif | 304 #endif |
| 304 | 305 |
| 305 // Loads a webui page that contains mojo bindings and verifies a message makes | 306 // Loads a webui page that contains mojo bindings and verifies a message makes |
| 306 // it from the browser to the page and back. | 307 // it from the browser to the page and back. |
| 307 IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) { | 308 IN_PROC_BROWSER_TEST_F(WebUIMojoTest, MAYBE_EndToEndPing) { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 factory()->set_run_loop(&run_loop); | 350 factory()->set_run_loop(&run_loop); |
| 350 GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?echo")); | 351 GURL test_url(test_server()->GetURL("files/web_ui_mojo.html?echo")); |
| 351 NavigateToURL(shell(), test_url); | 352 NavigateToURL(shell(), test_url); |
| 352 // RunLoop is quit when response received from page. | 353 // RunLoop is quit when response received from page. |
| 353 run_loop.Run(); | 354 run_loop.Run(); |
| 354 EXPECT_EQ(kExpectedMessageCount, message_count); | 355 EXPECT_EQ(kExpectedMessageCount, message_count); |
| 355 } | 356 } |
| 356 | 357 |
| 357 } // namespace | 358 } // namespace |
| 358 } // namespace content | 359 } // namespace content |
| OLD | NEW |