OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 // windows headers | 5 // windows headers |
6 #include <windows.h> | 6 #include <windows.h> |
7 #include <shellapi.h> | 7 #include <shellapi.h> |
8 #include <shlobj.h> | 8 #include <shlobj.h> |
9 #include <atlbase.h> | 9 #include <atlbase.h> |
10 #include <comutil.h> | 10 #include <comutil.h> |
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
272 NavigateToURL(url); | 272 NavigateToURL(url); |
273 WaitForFinish("private", "1", url, kTestCompleteCookie, | 273 WaitForFinish("private", "1", url, kTestCompleteCookie, |
274 kTestCompleteSuccess, kShortWaitTimeout); | 274 kTestCompleteSuccess, kShortWaitTimeout); |
275 } | 275 } |
276 | 276 |
277 // Test checking the privacy mode is on. | 277 // Test checking the privacy mode is on. |
278 TEST_F(NPAPIIncognitoTester, PrivateEnabled) { | 278 TEST_F(NPAPIIncognitoTester, PrivateEnabled) { |
279 if (UITest::in_process_renderer()) | 279 if (UITest::in_process_renderer()) |
280 return; | 280 return; |
281 | 281 |
282 GURL url = GetTestUrl(L"npapi", L"private.html?secure"); | 282 GURL url = GetTestUrl(L"npapi", L"private.html?private"); |
283 NavigateToURL(url); | 283 NavigateToURL(url); |
284 WaitForFinish("private", "1", url, kTestCompleteCookie, | 284 WaitForFinish("private", "1", url, kTestCompleteCookie, |
285 kTestCompleteSuccess, kShortWaitTimeout); | 285 kTestCompleteSuccess, kShortWaitTimeout); |
286 } | 286 } |
287 | 287 |
288 // Test a browser hang due to special case of multiple | 288 // Test a browser hang due to special case of multiple |
289 // plugin instances indulged in sync calls across renderer. | 289 // plugin instances indulged in sync calls across renderer. |
290 TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) { | 290 TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) { |
291 if (UITest::in_process_renderer()) | 291 if (UITest::in_process_renderer()) |
292 return; | 292 return; |
293 | 293 |
294 GURL url = GetTestUrl(L"npapi", L"multiple_instances_sync_calls.html"); | 294 GURL url = GetTestUrl(L"npapi", L"multiple_instances_sync_calls.html"); |
295 NavigateToURL(url); | 295 NavigateToURL(url); |
296 WaitForFinish("multiple_instances_sync_calls", "1", url, kTestCompleteCookie, | 296 WaitForFinish("multiple_instances_sync_calls", "1", url, kTestCompleteCookie, |
297 kTestCompleteSuccess, kShortWaitTimeout); | 297 kTestCompleteSuccess, kShortWaitTimeout); |
298 } | 298 } |
299 | 299 |
OLD | NEW |