| 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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::kDisableMediaSource)); | 237 EXPECT_TRUE(additional_params.HasSwitch(switches::kDisableMediaSource)); |
| 238 | 238 |
| 239 FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); | 239 base::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::kDisableMediaSource)); | 243 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableMediaSource)); |
| 244 | 244 |
| 245 DeleteChromeFramePolicyEntries(root[i]); | 245 DeleteChromeFramePolicyEntries(root[i]); |
| 246 } | 246 } |
| 247 } | 247 } |
| OLD | NEW |