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

Side by Side Diff: chrome_frame/test/policy_settings_unittest.cc

Issue 10915117: Enable Media Source API by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome_frame test Created 8 years, 3 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/at_exit.h" 6 #include "base/at_exit.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 218
219 DeleteChromeFramePolicyEntries(root[i]); 219 DeleteChromeFramePolicyEntries(root[i]);
220 } 220 }
221 } 221 }
222 222
223 TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { 223 TEST_F(PolicySettingsTest, AdditionalLaunchParameters) {
224 EXPECT_TRUE(PolicySettings::GetInstance()-> 224 EXPECT_TRUE(PolicySettings::GetInstance()->
225 AdditionalLaunchParameters().GetProgram().empty()); 225 AdditionalLaunchParameters().GetProgram().empty());
226 226
227 std::string test_switches("--"); 227 std::string test_switches("--");
228 test_switches += switches::kEnableMediaSource; 228 test_switches += switches::kDisableMediaSource;
229 229
230 HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; 230 HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER };
231 for (int i = 0; i < arraysize(root); ++i) { 231 for (int i = 0; i < arraysize(root); ++i) {
232 SetCFPolicyString(root[i], policy::key::kAdditionalLaunchParameters, 232 SetCFPolicyString(root[i], policy::key::kAdditionalLaunchParameters,
233 ASCIIToWide(test_switches).c_str()); 233 ASCIIToWide(test_switches).c_str());
234 ResetPolicySettings(); 234 ResetPolicySettings();
235 const CommandLine& additional_params = 235 const CommandLine& additional_params =
236 PolicySettings::GetInstance()->AdditionalLaunchParameters(); 236 PolicySettings::GetInstance()->AdditionalLaunchParameters();
237 EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaSource)); 237 EXPECT_TRUE(additional_params.HasSwitch(switches::kDisableMediaSource));
238 238
239 FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); 239 FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe"));
240 CommandLine new_cmd_line(program_path); 240 CommandLine new_cmd_line(program_path);
241 new_cmd_line.AppendArguments(additional_params, false); 241 new_cmd_line.AppendArguments(additional_params, false);
242 EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); 242 EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram());
243 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kEnableMediaSource)); 243 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableMediaSource));
244 244
245 DeleteChromeFramePolicyEntries(root[i]); 245 DeleteChromeFramePolicyEntries(root[i]);
246 } 246 }
247 } 247 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698