From b70403fc1eb901266182d2f40b57849b60fe6716 Mon Sep 17 00:00:00 2001
From: "avayvod@chromium.org"
 <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 7 Aug 2013 20:57:48 +0000
Subject: [PATCH] Revert "A flag to enable Cast support lab for Android" Not
 launching in this release.

This reverts commit 7ea5f2e765cc2d968e6879635e4b4e6f2f8e1359.

Conflicts:
	chrome/browser/about_flags.cc

BUG=178307
R=janx@chromium.org

Review URL: https://codereview.chromium.org/22524006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216270 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd | 8 --------
 chrome/browser/about_flags.cc      | 9 ---------
 chrome/common/chrome_switches.cc   | 4 ----
 chrome/common/chrome_switches.h    | 1 -
 4 files changed, 22 deletions(-)

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 17860a75e14e..5b40fbc43086 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6431,14 +6431,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_DEVICE_MOTION_DESCRIPTION" desc="Description for the flag to enable device motion.">
         Enables device motion DOM events in JavaScript.
       </message>
-      <if expr="is_android">
-        <message name="IDS_FLAGS_ENABLE_CAST_NAME" desc="Name of the flag to enable Google Cast support.">
-          Enable Google Cast support
-        </message>
-        <message name="IDS_FLAGS_ENABLE_CAST_DESCRIPTION" desc="Description for the flag to enable playing videos remotely on Google Cast receivers.">
-          Enable playing videos remotely on Google Cast receivers.
-        </message>
-      </if>
 
       <!-- Crashes -->
       <message name="IDS_CRASHES_TITLE" desc="Title for the chrome://crashes page.">
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index a326acfa2c4f..cffd9747bc7f 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1606,15 +1606,6 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kDisableAppList)
   },
 #endif
-#if defined(OS_ANDROID)
-  {
-    "enable-cast",
-    IDS_FLAGS_ENABLE_CAST_NAME,
-    IDS_FLAGS_ENABLE_CAST_DESCRIPTION,
-    kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kEnableCast)
-  },
-#endif
 };
 
 const Experiment* experiments = kExperiments;
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index d3d5d24a5cb9..811947087dfe 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1491,10 +1491,6 @@ const char kFakeCloudPolicyType[]           = "fake-cloud-policy-type";
 
 // Uses the tablet specific UI components when available.
 const char kTabletUI[]                      = "tablet-ui";
-
-// Enables support for playing videos on Google Cast devices.
-const char kEnableCast[]                    = "enable-cast";
-
 #endif
 
 #if defined(USE_ASH)
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 3b738629257b..3272ce5bdf60 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -408,7 +408,6 @@ extern const char kEnableNewNTP[];
 extern const char kEnableTranslate[];
 extern const char kFakeCloudPolicyType[];
 extern const char kTabletUI[];
-extern const char kEnableCast[];
 #endif
 
 #if defined(USE_ASH)
-- 
2.11.4.GIT