diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 18:56:11 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 18:56:11 +0000 |
| commit | da43c08ba42f2a1e1a36b627116f43c38d3824b0 (patch) | |
| tree | 6fc3af31e2871f4e7da0fc9a2b49eb380bef52ae /chrome_frame | |
| parent | 7e52297125e0d5ddcc59ffb435d84b61278d51c8 (diff) | |
| download | chromium_src-da43c08ba42f2a1e1a36b627116f43c38d3824b0.zip chromium_src-da43c08ba42f2a1e1a36b627116f43c38d3824b0.tar.gz chromium_src-da43c08ba42f2a1e1a36b627116f43c38d3824b0.tar.bz2 | |
Enable Media Source API by default.
BUG=144669
Review URL: https://chromiumcodereview.appspot.com/10915117
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/policy_settings_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index 8b6e03a..f888630 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::kEnableMediaSource; + test_switches += switches::kDisableMediaSource; HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; for (int i = 0; i < arraysize(root); ++i) { @@ -234,13 +234,13 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { ResetPolicySettings(); const CommandLine& additional_params = PolicySettings::GetInstance()->AdditionalLaunchParameters(); - EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaSource)); + EXPECT_TRUE(additional_params.HasSwitch(switches::kDisableMediaSource)); 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::kEnableMediaSource)); + EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kDisableMediaSource)); DeleteChromeFramePolicyEntries(root[i]); } |