Merge 243870 "Revert "Add experimental flag to enable Chromecast..."

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 1777 matching lines @@
     IDS_FLAGS_ENABLE_ADD_TO_HOMESCREEN_NAME,
     IDS_FLAGS_ENABLE_ADD_TO_HOMESCREEN_DESCRIPTION,
     kOsAndroid,
 #if defined(OS_ANDROID)
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableAddToHomescreen,
                               switches::kDisableAddToHomescreen),
 #else
     SINGLE_VALUE_TYPE("")
 #endif
   },
-#if defined(OS_ANDROID)
-  {
-    "enable-cast",
-    IDS_FLAGS_ENABLE_CAST_NAME,
-    IDS_FLAGS_ENABLE_CAST_DESCRIPTION,
-    kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kEnableCast)
-  },
-#endif
 #if defined(OS_CHROMEOS)
   {
     "disable-first-run-ui",
     IDS_FLAGS_DISABLE_FIRST_RUN_UI_NAME,
     IDS_FLAGS_DISABLE_FIRST_RUN_UI_DESCRIPTION,
     kOsCrOS,
     SINGLE_VALUE_TYPE(chromeos::switches::kDisableFirstRunUI)
   },
   {
     "enable-first-run-ui-transitions",
@@ skipping 646 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags