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

Side by Side Diff: chrome/test/plugin/plugin_test.cpp

Issue 3069014: Convert a bunch of easy AppendSwitchWithValue to *ASCII. (Closed)
Patch Set: fix Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Tests for the top plugins to catch regressions in our plugin host code, as 5 // Tests for the top plugins to catch regressions in our plugin host code, as
6 // well as in the out of process code. Currently this tests: 6 // well as in the out of process code. Currently this tests:
7 // Flash 7 // Flash
8 // Real 8 // Real
9 // QuickTime 9 // QuickTime
10 // Windows Media Player 10 // Windows Media Player
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 if (regkey.Open(HKEY_LOCAL_MACHINE, 57 if (regkey.Open(HKEY_LOCAL_MACHINE,
58 L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList", 58 L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList",
59 KEY_WRITE)) { 59 KEY_WRITE)) {
60 regkey.CreateKey(L"CHROME.EXE", KEY_READ); 60 regkey.CreateKey(L"CHROME.EXE", KEY_READ);
61 } 61 }
62 } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) { 62 } else if (strcmp(test_info->name(), "MediaPlayerOld") == 0) {
63 // When testing the old WMP plugin, we need to force Chrome to not load 63 // When testing the old WMP plugin, we need to force Chrome to not load
64 // the new plugin. 64 // the new plugin.
65 launch_arguments_.AppendSwitch(kUseOldWMPPluginSwitch); 65 launch_arguments_.AppendSwitch(kUseOldWMPPluginSwitch);
66 } else if (strcmp(test_info->name(), "FlashSecurity") == 0) { 66 } else if (strcmp(test_info->name(), "FlashSecurity") == 0) {
67 launch_arguments_.AppendSwitchWithValue(switches::kTestSandbox, 67 launch_arguments_.AppendSwitchASCII(switches::kTestSandbox,
68 "security_tests.dll"); 68 "security_tests.dll");
69 } 69 }
70 70
71 UITest::SetUp(); 71 UITest::SetUp();
72 } 72 }
73 #endif // defined(OS_WIN) 73 #endif // defined(OS_WIN)
74 74
75 void TestPlugin(const std::string& test_case, 75 void TestPlugin(const std::string& test_case,
76 int timeout, 76 int timeout,
77 bool mock_http) { 77 bool mock_http) {
78 GURL url = GetTestUrl(test_case, mock_http); 78 GURL url = GetTestUrl(test_case, mock_http);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 173
174 // http://crbug.com/8690 174 // http://crbug.com/8690
175 TEST_F(PluginTest, DISABLED_Java) { 175 TEST_F(PluginTest, DISABLED_Java) {
176 TestPlugin("Java.html", action_max_timeout_ms(), false); 176 TestPlugin("Java.html", action_max_timeout_ms(), false);
177 } 177 }
178 178
179 TEST_F(PluginTest, Silverlight) { 179 TEST_F(PluginTest, Silverlight) {
180 TestPlugin("silverlight.html", action_max_timeout_ms(), false); 180 TestPlugin("silverlight.html", action_max_timeout_ms(), false);
181 } 181 }
182 #endif // defined(OS_WIN) 182 #endif // defined(OS_WIN)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698