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

Unified Diff: chrome_frame/test/policy_settings_unittest.cc

Issue 14582024: Change media source switch to refer to the prefixed API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/policy_settings_unittest.cc
diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc
index 343b4262e5e49e736da400ab640a6b7dc994af92..ba1ecdd194f6083e19da3861447eb50e1d0f87cc 100644
--- a/chrome_frame/test/policy_settings_unittest.cc
+++ b/chrome_frame/test/policy_settings_unittest.cc
@@ -225,7 +225,7 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) {
AdditionalLaunchParameters().GetProgram().empty());
std::string test_switches("--");
- test_switches += switches::kDisableMediaSource;
+ test_switches += switches::kDisableWebKitMediaSource;
HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER };
for (int i = 0; i < arraysize(root); ++i) {
@@ -234,13 +234,14 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) {
ResetPolicySettings();
const CommandLine& additional_params =
PolicySettings::GetInstance()->AdditionalLaunchParameters();
- EXPECT_TRUE(additional_params.HasSwitch(switches::kDisableMediaSource));
+ EXPECT_TRUE(additional_params.HasSwitch(
+ switches::kDisableWebKitMediaSource));
base::FilePath program_path(FILE_PATH_LITERAL("my_chrome.exe"));
CommandLine new_cmd_line(program_path);
new_cmd_line.AppendArguments(additional_params, false);
EXPECT_NE(new_cmd_line.GetProgram(), additional_params.GetProgram());
- EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableMediaSource));
+ EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableWebKitMediaSource));
DeleteChromeFramePolicyEntries(root[i]);
}
« 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