diff options
author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 21:42:31 +0000 |
---|---|---|
committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 21:42:31 +0000 |
commit | 5bf1223a554ad8bd87bf24cf8edf779bcc5edfab (patch) | |
tree | c254f63dada64f9c3f09c21e23187677d1361c82 /chrome_frame | |
parent | cdcf18b0b4a7218e6053e3636b5038c679767528 (diff) | |
download | chromium_src-5bf1223a554ad8bd87bf24cf8edf779bcc5edfab.zip chromium_src-5bf1223a554ad8bd87bf24cf8edf779bcc5edfab.tar.gz chromium_src-5bf1223a554ad8bd87bf24cf8edf779bcc5edfab.tar.bz2 |
Change media source switch to refer to the prefixed API.
This is to make way for the flag that will control the unprefixed API that
will be coming soon.
BUG=239485
R=darin@chromium.org, grt@chromium.org, scherkus@chromium.org
Review URL: https://codereview.chromium.org/14582024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/test/policy_settings_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index 343b426..ba1ecdd 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]); } |