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

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

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 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
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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 324
325 IN_PROC_BROWSER_TEST_F(PluginTest, 325 IN_PROC_BROWSER_TEST_F(PluginTest,
326 MAYBE(SelfDeleteCreatePluginInNPNEvaluate)) { 326 MAYBE(SelfDeleteCreatePluginInNPNEvaluate)) {
327 LoadAndWait(GetURL("npn_plugin_delete_create_in_evaluate.html")); 327 LoadAndWait(GetURL("npn_plugin_delete_create_in_evaluate.html"));
328 } 328 }
329 329
330 #endif // OS_WIN 330 #endif // OS_WIN
331 331
332 // If this flakes, reopen http://crbug.com/17645 332 // If this flakes, reopen http://crbug.com/17645
333 // As of 6 July 2011, this test is flaky on Windows (perhaps due to timing out). 333 // As of 6 July 2011, this test is flaky on Windows (perhaps due to timing out).
334 #if !defined(OS_MACOSX) 334 #if !defined(OS_MACOSX) && !defined(OS_LINUX)
335 // Disabled on Mac because the plugin side isn't implemented yet, see 335 // Disabled on Mac because the plugin side isn't implemented yet, see
336 // "TODO(port)" in plugin_javascript_open_popup.cc. 336 // "TODO(port)" in plugin_javascript_open_popup.cc.
337 // Disabled on Linux because we don't support NPAPI any more.
337 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(OpenPopupWindowWithPlugin)) { 338 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(OpenPopupWindowWithPlugin)) {
338 LoadAndWait(GetURL("get_javascript_open_popup_with_plugin.html")); 339 LoadAndWait(GetURL("get_javascript_open_popup_with_plugin.html"));
339 } 340 }
340 #endif 341 #endif
341 342
342 // Test checking the privacy mode is off. 343 // Test checking the privacy mode is off.
343 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateDisabled)) { 344 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(PrivateDisabled)) {
344 LoadAndWait(GetURL("private.html")); 345 LoadAndWait(GetURL("private.html"));
345 } 346 }
346 347
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 ResourceDispatcherHostDelegate* old_delegate = 551 ResourceDispatcherHostDelegate* old_delegate =
551 ResourceDispatcherHostImpl::Get()->delegate(); 552 ResourceDispatcherHostImpl::Get()->delegate();
552 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); 553 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);
553 LoadAndWait(url); 554 LoadAndWait(url);
554 test_delegate.WaitForPluginRequest(); 555 test_delegate.WaitForPluginRequest();
555 ASSERT_TRUE(test_delegate.found_cookie()); 556 ASSERT_TRUE(test_delegate.found_cookie());
556 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); 557 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);
557 } 558 }
558 559
559 } // namespace content 560 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/test_support_gpu.gypi ('k') | content/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698