diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 20:55:40 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 20:55:40 +0000 |
| commit | 08381564c293920ccbefd8e08a5c3f47ebdcd8f0 (patch) | |
| tree | edda0048ebff874d46f1bb3846a64ca14fc96084 /chrome_frame | |
| parent | 2319c8ea422a6c314cf3db544c3c6bebb9e2ec90 (diff) | |
| download | chromium_src-08381564c293920ccbefd8e08a5c3f47ebdcd8f0.zip chromium_src-08381564c293920ccbefd8e08a5c3f47ebdcd8f0.tar.gz chromium_src-08381564c293920ccbefd8e08a5c3f47ebdcd8f0.tar.bz2 | |
Revert 137219 - enable media stream by default.
BUG=124790
TEST=local preview works without --enable-media-stream and remote view won't show without --enable-peer-connection.
Review URL: https://chromiumcodereview.appspot.com/10379003
TBR=wjia@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10389152
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/policy_settings_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome_frame/test/policy_settings_unittest.cc b/chrome_frame/test/policy_settings_unittest.cc index 8b6e03a..82a1598 100644 --- a/chrome_frame/test/policy_settings_unittest.cc +++ b/chrome_frame/test/policy_settings_unittest.cc @@ -225,6 +225,8 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { AdditionalLaunchParameters().GetProgram().empty()); std::string test_switches("--"); + test_switches += switches::kEnableMediaStream; + test_switches += " --"; test_switches += switches::kEnableMediaSource; HKEY root[] = { HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER }; @@ -234,12 +236,14 @@ TEST_F(PolicySettingsTest, AdditionalLaunchParameters) { ResetPolicySettings(); const CommandLine& additional_params = PolicySettings::GetInstance()->AdditionalLaunchParameters(); + EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaStream)); EXPECT_TRUE(additional_params.HasSwitch(switches::kEnableMediaSource)); 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::kEnableMediaStream)); EXPECT_TRUE(new_cmd_line.HasSwitch(switches::kEnableMediaSource)); DeleteChromeFramePolicyEntries(root[i]); |