OLD | NEW |
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" |
(...skipping 16 matching lines...) Expand all Loading... |
27 void SetUrlRequestMock(const base::FilePath& path) { | 27 void SetUrlRequestMock(const base::FilePath& path) { |
28 URLRequestMockHTTPJob::AddUrlHandler(path); | 28 URLRequestMockHTTPJob::AddUrlHandler(path); |
29 } | 29 } |
30 | 30 |
31 } | 31 } |
32 | 32 |
33 class PluginTest : public ContentBrowserTest { | 33 class PluginTest : public ContentBrowserTest { |
34 protected: | 34 protected: |
35 PluginTest() {} | 35 PluginTest() {} |
36 | 36 |
37 virtual void SetUpCommandLine(CommandLine* command_line) { | 37 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
38 // Some NPAPI tests schedule garbage collection to force object tear-down. | 38 // Some NPAPI tests schedule garbage collection to force object tear-down. |
39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc"); | 39 command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose_gc"); |
40 | 40 |
41 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
42 const testing::TestInfo* const test_info = | 42 const testing::TestInfo* const test_info = |
43 testing::UnitTest::GetInstance()->current_test_info(); | 43 testing::UnitTest::GetInstance()->current_test_info(); |
44 if (strcmp(test_info->name(), "MediaPlayerNew") == 0) { | 44 if (strcmp(test_info->name(), "MediaPlayerNew") == 0) { |
45 // The installer adds our process names to the registry key below. Since | 45 // The installer adds our process names to the registry key below. Since |
46 // the installer might not have run on this machine, add it manually. | 46 // the installer might not have run on this machine, add it manually. |
47 base::win::RegKey regkey; | 47 base::win::RegKey regkey; |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { | 450 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { |
451 TestPlugin("Java.html"); | 451 TestPlugin("Java.html"); |
452 } | 452 } |
453 | 453 |
454 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) { | 454 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) { |
455 TestPlugin("silverlight.html"); | 455 TestPlugin("silverlight.html"); |
456 } | 456 } |
457 #endif // defined(OS_WIN) | 457 #endif // defined(OS_WIN) |
458 | 458 |
459 } // namespace content | 459 } // namespace content |
OLD | NEW |