| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/test/base/web_ui_browsertest.h" | 5 #include "chrome/test/base/web_ui_browsertest.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 using content::NavigationController; | 48 using content::NavigationController; |
| 49 using content::RenderViewHost; | 49 using content::RenderViewHost; |
| 50 using content::WebContents; | 50 using content::WebContents; |
| 51 using content::WebUIController; | 51 using content::WebUIController; |
| 52 using content::WebUIMessageHandler; | 52 using content::WebUIMessageHandler; |
| 53 | 53 |
| 54 namespace { | 54 namespace { |
| 55 | 55 |
| 56 const base::FilePath::CharType kA11yAuditLibraryJSPath[] = FILE_PATH_LITERAL( | 56 const base::FilePath::CharType kA11yAuditLibraryJSPath[] = FILE_PATH_LITERAL( |
| 57 "third_party/accessibility-developer-tools/gen/axs_testing.js"); | 57 "third_party/accessibility-audit/axs_testing.js"); |
| 58 const base::FilePath::CharType kMockJSPath[] = | 58 const base::FilePath::CharType kMockJSPath[] = |
| 59 FILE_PATH_LITERAL("chrome/third_party/mock4js/mock4js.js"); | 59 FILE_PATH_LITERAL("chrome/third_party/mock4js/mock4js.js"); |
| 60 const base::FilePath::CharType kWebUILibraryJS[] = | 60 const base::FilePath::CharType kWebUILibraryJS[] = |
| 61 FILE_PATH_LITERAL("test_api.js"); | 61 FILE_PATH_LITERAL("test_api.js"); |
| 62 const base::FilePath::CharType kWebUITestFolder[] = FILE_PATH_LITERAL("webui"); | 62 const base::FilePath::CharType kWebUITestFolder[] = FILE_PATH_LITERAL("webui"); |
| 63 base::LazyInstance<std::vector<std::string> > error_messages_ = | 63 base::LazyInstance<std::vector<std::string> > error_messages_ = |
| 64 LAZY_INSTANCE_INITIALIZER; | 64 LAZY_INSTANCE_INITIALIZER; |
| 65 | 65 |
| 66 // Intercepts all log messages. | 66 // Intercepts all log messages. |
| 67 bool LogHandler(int severity, | 67 bool LogHandler(int severity, |
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 // testDone directly and expect pass result. | 776 // testDone directly and expect pass result. |
| 777 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPassesAsync) { | 777 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPassesAsync) { |
| 778 ASSERT_TRUE(RunJavascriptAsyncTest("testDone")); | 778 ASSERT_TRUE(RunJavascriptAsyncTest("testDone")); |
| 779 } | 779 } |
| 780 | 780 |
| 781 // Test that calling testDone during RunJavascriptTest still completes when | 781 // Test that calling testDone during RunJavascriptTest still completes when |
| 782 // waiting for async result. | 782 // waiting for async result. |
| 783 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPasses) { | 783 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPasses) { |
| 784 ASSERT_TRUE(RunJavascriptTest("testDone")); | 784 ASSERT_TRUE(RunJavascriptTest("testDone")); |
| 785 } | 785 } |
| OLD | NEW |