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/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 Loading... |
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::kEnableMediaStream; | |
229 test_switches += " --"; | |
230 test_switches += switches::kEnableMediaSource; | 228 test_switches += switches::kEnableMediaSource; |
231 | 229 |
232 HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; | 230 HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; |
233 for (int i = 0; i < arraysize(root); ++i) { | 231 for (int i = 0; i < arraysize(root); ++i) { |
234 SetCFPolicyString(root[i], policy::key::kAdditionalLaunchParameters, | 232 SetCFPolicyString(root[i], policy::key::kAdditionalLaunchParameters, |
235 ASCIIToWide(test_switches).c_str()); | 233 ASCIIToWide(test_switches).c_str()); |
236 ResetPolicySettings(); | 234 ResetPolicySettings(); |
237 const CommandLine& additional_params = | 235 const CommandLine& additional_params = |
238 PolicySettings::GetInstance()->AdditionalLaunchParameters(); | 236 PolicySettings::GetInstance()->AdditionalLaunchParameters(); |
239 EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaStream)); | |
240 EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaSource)); | 237 EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaSource)); |
241 | 238 |
242 FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); | 239 FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); |
243 CommandLine new_cmd_line(program_path); | 240 CommandLine new_cmd_line(program_path); |
244 new_cmd_line.AppendArguments(additional_params, false); | 241 new_cmd_line.AppendArguments(additional_params, false); |
245 EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); | 242 EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); |
246 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kEnableMediaStream)); | |
247 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kEnableMediaSource)); | 243 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kEnableMediaSource)); |
248 | 244 |
249 DeleteChromeFramePolicyEntries(root[i]); | 245 DeleteChromeFramePolicyEntries(root[i]); |
250 } | 246 } |
251 } | 247 } |
OLD | NEW |