| OLD | NEW |
| 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 #include <comutil.h> | 8 #include <comutil.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #include <shlobj.h> | 10 #include <shlobj.h> |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 | 306 |
| 307 TEST_F(NPAPITesterBase, PluginThreadAsyncCall) { | 307 TEST_F(NPAPITesterBase, PluginThreadAsyncCall) { |
| 308 const FilePath test_case(FILE_PATH_LITERAL("plugin_thread_async_call.html")); | 308 const FilePath test_case(FILE_PATH_LITERAL("plugin_thread_async_call.html")); |
| 309 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); | 309 GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); |
| 310 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 310 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
| 311 WaitForFinish("plugin_thread_async_call", "1", url, kTestCompleteCookie, | 311 WaitForFinish("plugin_thread_async_call", "1", url, kTestCompleteCookie, |
| 312 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 312 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
| 313 } | 313 } |
| 314 | 314 |
| 315 // Test checking the privacy mode is on. | 315 // Test checking the privacy mode is on. |
| 316 #if defined(OS_LINUX) |
| 317 // http://crbug.com/104380 |
| 318 #define PrivateEnabled FLAKY_PrivateEnabled |
| 319 #endif |
| 316 TEST_F(NPAPIIncognitoTester, PrivateEnabled) { | 320 TEST_F(NPAPIIncognitoTester, PrivateEnabled) { |
| 317 const FilePath test_case(FILE_PATH_LITERAL("private.html")); | 321 const FilePath test_case(FILE_PATH_LITERAL("private.html")); |
| 318 GURL url = ui_test_utils::GetFileUrlWithQuery( | 322 GURL url = ui_test_utils::GetFileUrlWithQuery( |
| 319 ui_test_utils::GetTestFilePath(FilePath(kTestDir), test_case), "private"); | 323 ui_test_utils::GetTestFilePath(FilePath(kTestDir), test_case), "private"); |
| 320 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 324 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
| 321 WaitForFinish("private", "1", url, kTestCompleteCookie, | 325 WaitForFinish("private", "1", url, kTestCompleteCookie, |
| 322 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 326 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
| 323 } | 327 } |
| 324 | 328 |
| 325 #if defined(OS_WIN) || defined(OS_MACOSX) | 329 #if defined(OS_WIN) || defined(OS_MACOSX) |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 ASSERT_TRUE(tab->LoadBlockedPlugins()); | 448 ASSERT_TRUE(tab->LoadBlockedPlugins()); |
| 445 | 449 |
| 446 WaitForFinish("setup", "1", url, kTestCompleteCookie, | 450 WaitForFinish("setup", "1", url, kTestCompleteCookie, |
| 447 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 451 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
| 448 | 452 |
| 449 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); | 453 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); |
| 450 | 454 |
| 451 WaitForFinish("setup", "2", url, kTestCompleteCookie, | 455 WaitForFinish("setup", "2", url, kTestCompleteCookie, |
| 452 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 456 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
| 453 } | 457 } |
| OLD | NEW |