Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(881)

Side by Side Diff: chrome/test/ui/npapi_uitest.cc

Issue 6334050: Re-enable the test that I disabled last night. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | webkit/plugins/npapi/test/plugin_schedule_timer_test.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 // windows headers 8 // windows headers
9 #include <comutil.h> 9 #include <comutil.h>
10 #include <shellapi.h> 10 #include <shellapi.h>
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 if (ProxyLauncher::in_process_renderer()) 264 if (ProxyLauncher::in_process_renderer())
265 return; 265 return;
266 266
267 const FilePath test_case(FILE_PATH_LITERAL("private.html")); 267 const FilePath test_case(FILE_PATH_LITERAL("private.html"));
268 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); 268 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
269 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 269 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
270 WaitForFinish("private", "1", url, kTestCompleteCookie, 270 WaitForFinish("private", "1", url, kTestCompleteCookie,
271 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 271 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
272 } 272 }
273 273
274 #if !defined(OS_LINUX)
275 TEST_F(NPAPITesterBase, ScheduleTimer) { 274 TEST_F(NPAPITesterBase, ScheduleTimer) {
276 const FilePath test_case(FILE_PATH_LITERAL("schedule_timer.html")); 275 const FilePath test_case(FILE_PATH_LITERAL("schedule_timer.html"));
277 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); 276 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
278 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 277 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
279 WaitForFinish("schedule_timer", "1", url, kTestCompleteCookie, 278 WaitForFinish("schedule_timer", "1", url, kTestCompleteCookie,
280 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 279 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
281 } 280 }
282 281
283 TEST_F(NPAPITesterBase, PluginThreadAsyncCall) { 282 TEST_F(NPAPITesterBase, PluginThreadAsyncCall) {
284 const FilePath test_case(FILE_PATH_LITERAL("plugin_thread_async_call.html")); 283 const FilePath test_case(FILE_PATH_LITERAL("plugin_thread_async_call.html"));
285 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); 284 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
286 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 285 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
287 WaitForFinish("plugin_thread_async_call", "1", url, kTestCompleteCookie, 286 WaitForFinish("plugin_thread_async_call", "1", url, kTestCompleteCookie,
288 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 287 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
289 } 288 }
290 #endif
291 289
292 // Test checking the privacy mode is on. 290 // Test checking the privacy mode is on.
293 TEST_F(NPAPIIncognitoTester, PrivateEnabled) { 291 TEST_F(NPAPIIncognitoTester, PrivateEnabled) {
294 if (ProxyLauncher::in_process_renderer()) 292 if (ProxyLauncher::in_process_renderer())
295 return; 293 return;
296 294
297 const FilePath test_case(FILE_PATH_LITERAL("private.html?private")); 295 const FilePath test_case(FILE_PATH_LITERAL("private.html?private"));
298 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); 296 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case);
299 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 297 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
300 WaitForFinish("private", "1", url, kTestCompleteCookie, 298 WaitForFinish("private", "1", url, kTestCompleteCookie,
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); 415 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
418 416
419 scoped_refptr<TabProxy> tab(browser->GetTab(0)); 417 scoped_refptr<TabProxy> tab(browser->GetTab(0));
420 ASSERT_TRUE(tab.get()); 418 ASSERT_TRUE(tab.get());
421 419
422 ASSERT_TRUE(tab->LoadBlockedPlugins()); 420 ASSERT_TRUE(tab->LoadBlockedPlugins());
423 421
424 WaitForFinish("setup", "1", url, kTestCompleteCookie, 422 WaitForFinish("setup", "1", url, kTestCompleteCookie,
425 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 423 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
426 } 424 }
OLDNEW
« no previous file with comments | « no previous file | webkit/plugins/npapi/test/plugin_schedule_timer_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698