summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 18:34:38 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 18:34:38 +0000
commit7eb0a13fe183682d31b8e908285882c0ba0f96a6 (patch)
tree7e3862f90bc2627758a08b0b670f523003c33940
parente75d263326113c2b40a2317e5a25d64adc9a3ddc (diff)
downloadchromium_src-7eb0a13fe183682d31b8e908285882c0ba0f96a6.zip
chromium_src-7eb0a13fe183682d31b8e908285882c0ba0f96a6.tar.gz
chromium_src-7eb0a13fe183682d31b8e908285882c0ba0f96a6.tar.bz2
Merge 122752 - Testing MediaStream on ChromeOS seems to be a chicken-and-egg problem, so after input from kanlui and zelidrag I'm enabling this for all OSs. Tommi, let me know if this is OK for you to review, would be nice to have this in place when US returns from President's Day.
Review URL: http://codereview.chromium.org/9426031 TBR=niklase@chromium.org BUG=115203 Review URL: https://chromiumcodereview.appspot.com/9432032 git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@123066 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/about_flags.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 7cfef47..69288b0 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -541,7 +541,7 @@ const Experiment kExperiments[] = {
"enable-media-stream",
IDS_FLAGS_MEDIA_STREAM_NAME,
IDS_FLAGS_MEDIA_STREAM_DESCRIPTION,
- kOsWin | kOsLinux | kOsMac,
+ kOsAll,
SINGLE_VALUE_TYPE(switches::kEnableMediaStream)
},
{