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

Side by Side Diff: content/browser/plugin_browsertest.cc

Issue 557893003: Stop using an atom to store plugin name/version on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/loader/resource_dispatcher_host_impl.h" 10 #include "content/browser/loader/resource_dispatcher_host_impl.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 LoadAndWait(GetURL("get_javascript_url.html")); 235 LoadAndWait(GetURL("get_javascript_url.html"));
236 } 236 }
237 237
238 // Test that calling GetURL with a javascript URL and target=_self 238 // Test that calling GetURL with a javascript URL and target=_self
239 // works properly when the plugin is embedded in a subframe. 239 // works properly when the plugin is embedded in a subframe.
240 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) { 240 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) {
241 LoadAndWait(GetURL("get_javascript_url2.html")); 241 LoadAndWait(GetURL("get_javascript_url2.html"));
242 } 242 }
243 243
244 // Test is flaky on linux/cros/win builders. http://crbug.com/71904 244 // Test is flaky on linux/cros/win builders. http://crbug.com/71904
245 #if !defined(OS_WIN) // http://crbug.com/412042
246 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRedirectNotification) { 245 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRedirectNotification) {
247 LoadAndWait(GetURL("geturl_redirect_notify.html")); 246 LoadAndWait(GetURL("geturl_redirect_notify.html"));
248 } 247 }
249 #endif
250 248
251 // Tests that identity is preserved for NPObjects passed from a plugin 249 // Tests that identity is preserved for NPObjects passed from a plugin
252 // into JavaScript. 250 // into JavaScript.
253 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectIdentity)) { 251 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(NPObjectIdentity)) {
254 LoadAndWait(GetURL("npobject_identity.html")); 252 LoadAndWait(GetURL("npobject_identity.html"));
255 } 253 }
256 254
257 // Tests that if an NPObject is proxies back to its original process, the 255 // Tests that if an NPObject is proxies back to its original process, the
258 // original pointer is returned and not a proxy. If this fails the plugin 256 // original pointer is returned and not a proxy. If this fails the plugin
259 // will crash. 257 // will crash.
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 } 347 }
350 348
351 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ScheduleTimer)) { 349 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ScheduleTimer)) {
352 LoadAndWait(GetURL("schedule_timer.html")); 350 LoadAndWait(GetURL("schedule_timer.html"));
353 } 351 }
354 352
355 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PluginThreadAsyncCall)) { 353 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PluginThreadAsyncCall)) {
356 LoadAndWait(GetURL("plugin_thread_async_call.html")); 354 LoadAndWait(GetURL("plugin_thread_async_call.html"));
357 } 355 }
358 356
359 #if !defined(OS_WIN) // http://crbug.com/412042
360 IN_PROC_BROWSER_TEST_F(PluginTest, PluginSingleRangeRequest) { 357 IN_PROC_BROWSER_TEST_F(PluginTest, PluginSingleRangeRequest) {
361 LoadAndWait(GetURL("plugin_single_range_request.html")); 358 LoadAndWait(GetURL("plugin_single_range_request.html"));
362 } 359 }
363 #endif
364 360
365 #if !defined(OS_WIN) // http://crbug.com/396373 361 #if !defined(OS_WIN) // http://crbug.com/396373
366 // Test checking the privacy mode is on. 362 // Test checking the privacy mode is on.
367 // If this flakes on Linux, use http://crbug.com/104380 363 // If this flakes on Linux, use http://crbug.com/104380
368 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateEnabled)) { 364 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateEnabled)) {
369 GURL url = GetURL("private.html"); 365 GURL url = GetURL("private.html");
370 url = GURL(url.spec() + "?private"); 366 url = GURL(url.spec() + "?private");
371 LoadAndWaitInWindow(CreateOffTheRecordBrowser(), url); 367 LoadAndWaitInWindow(CreateOffTheRecordBrowser(), url);
372 } 368 }
373 #endif 369 #endif
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 ResourceDispatcherHostDelegate* old_delegate = 557 ResourceDispatcherHostDelegate* old_delegate =
562 ResourceDispatcherHostImpl::Get()->delegate(); 558 ResourceDispatcherHostImpl::Get()->delegate();
563 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); 559 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);
564 LoadAndWait(url); 560 LoadAndWait(url);
565 test_delegate.WaitForPluginRequest(); 561 test_delegate.WaitForPluginRequest();
566 ASSERT_TRUE(test_delegate.found_cookie()); 562 ASSERT_TRUE(test_delegate.found_cookie());
567 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); 563 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);
568 } 564 }
569 565
570 } // namespace content 566 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/hang_monitor/hung_plugin_action.cc ('k') | content/browser/plugin_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698