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

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

Issue 453153002: Disable PluginTest.GetURL on Mac since it's failing even with retries sometimes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | no next file » | 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) 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/file_util.h" 6 #include "base/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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Arguments)) { 215 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Arguments)) {
216 LoadAndWait(GetURL("arguments.html")); 216 LoadAndWait(GetURL("arguments.html"));
217 } 217 }
218 #endif 218 #endif
219 219
220 // Test invoking many plugins within a single page. 220 // Test invoking many plugins within a single page.
221 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ManyPlugins)) { 221 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(ManyPlugins)) {
222 LoadAndWait(GetURL("many_plugins.html")); 222 LoadAndWait(GetURL("many_plugins.html"));
223 } 223 }
224 224
225 #if !defined(OS_MACOSX) // http://crbug.com/402164
Avi (use Gerrit) 2014/08/08 22:43:20 Not DISABLED_?
225 // Test various calls to GetURL from a plugin. 226 // Test various calls to GetURL from a plugin.
226 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURL)) { 227 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetURL)) {
227 LoadAndWait(GetURL("geturl.html")); 228 LoadAndWait(GetURL("geturl.html"));
228 } 229 }
230 #endif
229 231
230 // Test various calls to GetURL for javascript URLs with 232 // Test various calls to GetURL for javascript URLs with
231 // non NULL targets from a plugin. 233 // non NULL targets from a plugin.
232 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL)) { 234 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL)) {
233 LoadAndWait(GetURL("get_javascript_url.html")); 235 LoadAndWait(GetURL("get_javascript_url.html"));
234 } 236 }
235 237
236 // Test that calling GetURL with a javascript URL and target=_self 238 // Test that calling GetURL with a javascript URL and target=_self
237 // works properly when the plugin is embedded in a subframe. 239 // works properly when the plugin is embedded in a subframe.
238 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) { 240 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(GetJavaScriptURL2)) {
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 ResourceDispatcherHostDelegate* old_delegate = 554 ResourceDispatcherHostDelegate* old_delegate =
553 ResourceDispatcherHostImpl::Get()->delegate(); 555 ResourceDispatcherHostImpl::Get()->delegate();
554 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); 556 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);
555 LoadAndWait(url); 557 LoadAndWait(url);
556 test_delegate.WaitForPluginRequest(); 558 test_delegate.WaitForPluginRequest();
557 ASSERT_TRUE(test_delegate.found_cookie()); 559 ASSERT_TRUE(test_delegate.found_cookie());
558 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); 560 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);
559 } 561 }
560 562
561 } // namespace content 563 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698