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

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

Issue 22394006: Get rid of webkit/plugins/plugin_switches.* and move them to content/public/common/content_switches… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 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
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/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "content/public/test/browser_test_utils.h" 11 #include "content/public/test/browser_test_utils.h"
12 #include "content/shell/common/shell_switches.h" 12 #include "content/shell/common/shell_switches.h"
13 #include "content/shell/shell.h" 13 #include "content/shell/shell.h"
14 #include "content/test/content_browser_test.h" 14 #include "content/test/content_browser_test.h"
15 #include "content/test/content_browser_test_utils.h" 15 #include "content/test/content_browser_test_utils.h"
16 #include "content/test/net/url_request_mock_http_job.h" 16 #include "content/test/net/url_request_mock_http_job.h"
17 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
18 #include "webkit/plugins/plugin_switches.h"
19 18
20 #if defined(OS_WIN) 19 #if defined(OS_WIN)
21 #include "base/win/registry.h" 20 #include "base/win/registry.h"
22 #endif 21 #endif
23 22
24 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861 23 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861
25 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) 24 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
26 #define MAYBE(x) DISABLED_##x 25 #define MAYBE(x) DISABLED_##x
27 #else 26 #else
28 #define MAYBE(x) x 27 #define MAYBE(x) x
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { 453 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
455 TestPlugin("Java.html"); 454 TestPlugin("Java.html");
456 } 455 }
457 456
458 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) { 457 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) {
459 TestPlugin("silverlight.html"); 458 TestPlugin("silverlight.html");
460 } 459 }
461 #endif // defined(OS_WIN) 460 #endif // defined(OS_WIN)
462 461
463 } // namespace content 462 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl_private.cc ('k') | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698