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/at_exit.h" | 5 #include "base/at_exit.h" |
6 #include "base/basictypes.h" | 6 #include "base/basictypes.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/strings/stringprintf.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "base/win/registry.h" | 11 #include "base/win/registry.h" |
12 #include "chrome_frame/policy_settings.h" | 12 #include "chrome_frame/policy_settings.h" |
13 #include "chrome_frame/test/chrome_frame_test_utils.h" | 13 #include "chrome_frame/test/chrome_frame_test_utils.h" |
14 #include "content/public/common/content_switches.h" | 14 #include "content/public/common/content_switches.h" |
15 #include "policy/policy_constants.h" | 15 #include "policy/policy_constants.h" |
16 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
17 | 17 |
18 using base::win::RegKey; | 18 using base::win::RegKey; |
19 using chrome_frame_test::ScopedVirtualizeHklmAndHkcu; | 19 using chrome_frame_test::ScopedVirtualizeHklmAndHkcu; |
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
239 | 239 |
240 base::FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); | 240 base::FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe")); |
241 CommandLine new_cmd_line(program_path); | 241 CommandLine new_cmd_line(program_path); |
242 new_cmd_line.AppendArguments(additional_params, false); | 242 new_cmd_line.AppendArguments(additional_params, false); |
243 EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); | 243 EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram()); |
244 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableWebKitMediaSource)); | 244 EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableWebKitMediaSource)); |
245 | 245 |
246 DeleteChromeFramePolicyEntries(root[i]); | 246 DeleteChromeFramePolicyEntries(root[i]); |
247 } | 247 } |
248 } | 248 } |
OLD | NEW |