reland http://codereview.chromium.org/10379003/

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 516 matching lines @@
     IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_NAME,
     IDS_FLAGS_DISABLE_SOFTWARE_RASTERIZER_DESCRIPTION,
 #if defined(ENABLE_SWIFTSHADER)
     kOsAll,
 #else
     0,
 #endif
     SINGLE_VALUE_TYPE(switches::kDisableSoftwareRasterizer)
   },
   {
-    "enable-media-stream",
-    IDS_FLAGS_MEDIA_STREAM_NAME,
-    IDS_FLAGS_MEDIA_STREAM_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableMediaStream)
-  },
-  {
     "enable-peer-connection",
     IDS_FLAGS_PEER_CONNECTION_NAME,
     IDS_FLAGS_PEER_CONNECTION_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnablePeerConnection)
   },
   {
     "enable-shadow-dom",
     IDS_FLAGS_SHADOW_DOM_NAME,
     IDS_FLAGS_SHADOW_DOM_DESCRIPTION,
@@ skipping 606 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags