OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/file_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/common/chrome_switches.h" | 9 #include "chrome/common/chrome_switches.h" |
10 #include "chrome/test/automation/tab_proxy.h" | 10 #include "chrome/test/automation/tab_proxy.h" |
11 #include "chrome/test/ui/ui_test.h" | 11 #include "chrome/test/ui/ui_test.h" |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 ASSERT_TRUE(tab.get()); | 86 ASSERT_TRUE(tab.get()); |
87 ASSERT_TRUE(tab->NavigateToURL(test_url)); | 87 ASSERT_TRUE(tab->NavigateToURL(test_url)); |
88 | 88 |
89 // First wait for the "starting" signal. This cookie is set at the start | 89 // First wait for the "starting" signal. This cookie is set at the start |
90 // of every test. Waiting for this separately allows us to avoid a single | 90 // of every test. Waiting for this separately allows us to avoid a single |
91 // long timeout. Instead, we can have two timeouts which allow startup + | 91 // long timeout. Instead, we can have two timeouts which allow startup + |
92 // test execution time to take a while on a loaded computer, while also | 92 // test execution time to take a while on a loaded computer, while also |
93 // making sure we're making forward progress. | 93 // making sure we're making forward progress. |
94 std::string startup_cookie = | 94 std::string startup_cookie = |
95 WaitUntilCookieNonEmpty(tab.get(), test_url, | 95 WaitUntilCookieNonEmpty(tab.get(), test_url, |
96 "STARTUP_COOKIE", action_max_timeout_ms()); | 96 "STARTUP_COOKIE", TestTimeouts::action_max_timeout_ms()); |
97 | 97 |
98 // If this fails, the plugin couldn't be loaded in the given amount of | 98 // If this fails, the plugin couldn't be loaded in the given amount of |
99 // time. This may mean the plugin was not found or possibly the system | 99 // time. This may mean the plugin was not found or possibly the system |
100 // can't load it due to missing symbols, etc. | 100 // can't load it due to missing symbols, etc. |
101 ASSERT_STREQ("STARTED", startup_cookie.c_str()) | 101 ASSERT_STREQ("STARTED", startup_cookie.c_str()) |
102 << "Plugin couldn't be loaded. Make sure the PPAPI test plugin is " | 102 << "Plugin couldn't be loaded. Make sure the PPAPI test plugin is " |
103 << "built, in the right place, and doesn't have any missing symbols."; | 103 << "built, in the right place, and doesn't have any missing symbols."; |
104 | 104 |
105 std::string escaped_value = | 105 std::string escaped_value = |
106 WaitUntilCookieNonEmpty(tab.get(), test_url, | 106 WaitUntilCookieNonEmpty(tab.get(), test_url, |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 | 161 |
162 // TODO(dumi): figure out why this test is flaky / crashing. | 162 // TODO(dumi): figure out why this test is flaky / crashing. |
163 TEST_F(PPAPITest, DISABLED_FileRef) { | 163 TEST_F(PPAPITest, DISABLED_FileRef) { |
164 RunTestViaHTTP("FileRef"); | 164 RunTestViaHTTP("FileRef"); |
165 } | 165 } |
166 | 166 |
167 // http://crbug.com/63239 | 167 // http://crbug.com/63239 |
168 TEST_F(PPAPITest, DISABLED_DirectoryReader) { | 168 TEST_F(PPAPITest, DISABLED_DirectoryReader) { |
169 RunTestViaHTTP("DirectoryReader"); | 169 RunTestViaHTTP("DirectoryReader"); |
170 } | 170 } |
OLD | NEW |