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

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

Issue 501074: Enable windowless-based npapi_test_plugin tests on the Mac. (Closed)
Patch Set: Created 11 years 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
« no previous file with comments | « no previous file | webkit/glue/plugins/test/plugin_client.cc » ('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) 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 #if defined(OS_WIN) 5 #if defined(OS_WIN)
6 // windows headers 6 // windows headers
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <shlobj.h> 9 #include <shlobj.h>
10 #include <comutil.h> 10 #include <comutil.h>
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 automation()->WaitForAppModalDialog(5000); 155 automation()->WaitForAppModalDialog(5000);
156 scoped_refptr<WindowProxy> window(automation()->GetActiveWindow()); 156 scoped_refptr<WindowProxy> window(automation()->GetActiveWindow());
157 ASSERT_TRUE(window.get()); 157 ASSERT_TRUE(window.get());
158 ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0)); 158 ASSERT_TRUE(window->SimulateOSKeyPress(base::VKEY_ESCAPE, 0));
159 159
160 WaitForFinish("self_delete_plugin_invoke_alert", "1", url, 160 WaitForFinish("self_delete_plugin_invoke_alert", "1", url,
161 kTestCompleteCookie, kTestCompleteSuccess, 161 kTestCompleteCookie, kTestCompleteSuccess,
162 kShortWaitTimeout); 162 kShortWaitTimeout);
163 } 163 }
164 164
165 #if defined(OS_WIN) 165 #if defined(OS_WIN) || defined(OS_MACOSX)
166 // Tests if a plugin executing a self deleting script in the context of 166 // Tests if a plugin executing a self deleting script in the context of
167 // a synchronous paint event works correctly 167 // a synchronous paint event works correctly
168 TEST_F(NPAPIVisiblePluginTester, 168 TEST_F(NPAPIVisiblePluginTester,
169 DISABLED_SelfDeletePluginInvokeInSynchronousPaint) { 169 DISABLED_SelfDeletePluginInvokeInSynchronousPaint) {
170 if (UITest::in_process_renderer()) 170 if (UITest::in_process_renderer())
171 return; 171 return;
172 172
173 show_window_ = true; 173 show_window_ = true;
174 std::wstring test_case = L"execute_script_delete_in_paint.html"; 174 std::wstring test_case = L"execute_script_delete_in_paint.html";
175 GURL url = GetTestUrl(L"npapi", test_case); 175 GURL url = GetTestUrl(L"npapi", test_case);
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 TEST_F(NPAPIIncognitoTester, PrivateEnabled) { 315 TEST_F(NPAPIIncognitoTester, PrivateEnabled) {
316 if (UITest::in_process_renderer()) 316 if (UITest::in_process_renderer())
317 return; 317 return;
318 318
319 GURL url = GetTestUrl(L"npapi", L"private.html?private"); 319 GURL url = GetTestUrl(L"npapi", L"private.html?private");
320 NavigateToURL(url); 320 NavigateToURL(url);
321 WaitForFinish("private", "1", url, kTestCompleteCookie, 321 WaitForFinish("private", "1", url, kTestCompleteCookie,
322 kTestCompleteSuccess, kShortWaitTimeout); 322 kTestCompleteSuccess, kShortWaitTimeout);
323 } 323 }
324 324
325 #if defined(OS_WIN) 325 #if defined(OS_WIN) || defined(OS_MACOSX)
326 // Test a browser hang due to special case of multiple 326 // Test a browser hang due to special case of multiple
327 // plugin instances indulged in sync calls across renderer. 327 // plugin instances indulged in sync calls across renderer.
328 TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) { 328 TEST_F(NPAPIVisiblePluginTester, MultipleInstancesSyncCalls) {
329 if (UITest::in_process_renderer()) 329 if (UITest::in_process_renderer())
330 return; 330 return;
331 331
332 GURL url = GetTestUrl(L"npapi", L"multiple_instances_sync_calls.html"); 332 GURL url = GetTestUrl(L"npapi", L"multiple_instances_sync_calls.html");
333 NavigateToURL(url); 333 NavigateToURL(url);
334 WaitForFinish("multiple_instances_sync_calls", "1", url, kTestCompleteCookie, 334 WaitForFinish("multiple_instances_sync_calls", "1", url, kTestCompleteCookie,
335 kTestCompleteSuccess, kShortWaitTimeout); 335 kTestCompleteSuccess, kShortWaitTimeout);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 GURL url(URLRequestMockHTTPJob::GetMockUrl( 418 GURL url(URLRequestMockHTTPJob::GetMockUrl(
419 FilePath(FILE_PATH_LITERAL( 419 FilePath(FILE_PATH_LITERAL(
420 "npapi/plugin_url_request_referrer_test.html")))); 420 "npapi/plugin_url_request_referrer_test.html"))));
421 421
422 NavigateToURL(url); 422 NavigateToURL(url);
423 423
424 WaitForFinish("plugin_referrer_test", "1", url, kTestCompleteCookie, 424 WaitForFinish("plugin_referrer_test", "1", url, kTestCompleteCookie,
425 kTestCompleteSuccess, kShortWaitTimeout); 425 kTestCompleteSuccess, kShortWaitTimeout);
426 } 426 }
427 427
OLDNEW
« no previous file with comments | « no previous file | webkit/glue/plugins/test/plugin_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698