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

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

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix compile Created 8 years, 1 month 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/utf_string_conversions.h" 8 #include "base/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/shell.h" 12 #include "content/shell/shell.h"
13 #include "content/shell/shell_switches.h" 13 #include "content/shell/shell_switches.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" 18 #include "webkit/plugins/plugin_switches.h"
19 19
20 #if defined(OS_WIN) 20 #if defined(OS_WIN)
21 #include "base/win/registry.h" 21 #include "base/win/registry.h"
22 #endif 22 #endif
23 23
24 namespace content {
24 namespace { 25 namespace {
25 26
26 void SetUrlRequestMock(const FilePath& path) { 27 void SetUrlRequestMock(const FilePath& path) {
27 URLRequestMockHTTPJob::AddUrlHandler(path); 28 URLRequestMockHTTPJob::AddUrlHandler(path);
28 } 29 }
29 30
30 } 31 }
31 32
32 namespace content {
33
34 class PluginTest : public ContentBrowserTest { 33 class PluginTest : public ContentBrowserTest {
35 protected: 34 protected:
36 PluginTest() {} 35 PluginTest() {}
37 36
38 virtual void SetUpCommandLine(CommandLine* command_line) { 37 virtual void SetUpCommandLine(CommandLine* command_line) {
39 // Some NPAPI tests schedule garbage collection to force object tear-down. 38 // Some NPAPI tests schedule garbage collection to force object tear-down.
40 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc"); 39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc");
41 40
42 #if defined(OS_WIN) 41 #if defined(OS_WIN)
43 const testing::TestInfo* const test_info = 42 const testing::TestInfo* const test_info =
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { 455 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
457 TestPlugin("Java.html"); 456 TestPlugin("Java.html");
458 } 457 }
459 458
460 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) { 459 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) {
461 TestPlugin("silverlight.html"); 460 TestPlugin("silverlight.html");
462 } 461 }
463 #endif // defined(OS_WIN) 462 #endif // defined(OS_WIN)
464 463
465 } // namespace content 464 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698