Revert 150041 to re-enable Chrome to Mobile by default on trunk (after M22 branch).

Change 150041 - Revert 143421 to disable Chrome to Mobile by default on trunk (for M22 branch).

Change 143421 - Revert 142809 to re-enable Chrome to Mobile by default on trunk (after M21 branch).

Change 142809 - Revert 135840 to disable Chrome to Mobile by default on trunk (for M21 branch).

Change 135840 - Revert 135442 to re-enable Chrome to Mobile by default on trunk.
We passed the M20 branch point with Chrome to Mobile disabled, as intended.

Change 135442 - Disable Chrome To Mobile by default; enable via chrome://flags.
This feature should be disabled-by-default on M19; for immediate merge.

Don't revert http://crrev.com/130312 to keep the AboutFlags_disable-chrome-to-mobile UMA bin.
Note: Mac's ViewIDTests don't yet support VIEW_ID_CHROME_TO_MOBILE_BUTTON.

BUG=102709, 120905
TEST=Chrome To Mobile is enabled on trunk (after M22 branch point).
TBR=msw@chromium.org,sky@chromium.org,nyquist@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10827285

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151120 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/about_flags.cc

@@ -676,11 +676,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage)
   },
   {
-    "enable-chrome-to-mobile",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_NAME,
-    IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_DESCRIPTION,
+    "disable-chrome-to-mobile",  // FLAGS:RECORD_UMA
+    IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME,
+    IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableChromeToMobile)
+    SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile)
   },
 #if defined(GOOGLE_CHROME_BUILD)
   {

chrome/browser/chrome_to_mobile_service.cc

@@ -46,7 +46,7 @@
 namespace {
 
 // The default enabled/disabled state of the Chrome To Mobile feature.
-const bool kChromeToMobileEnabled = false;
+const bool kChromeToMobileEnabled = true;
 
 // The maximum number of retries for the URLFetcher requests.
 const size_t kMaxRetries = 1;

chrome/browser/ui/gtk/view_id_util_browsertest.cc

@@ -48,10 +48,6 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) {
       continue;
     }
 
-    // Chrome To Mobile is disabled by default.
-    if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON)
-      continue;
-
     CheckViewID(static_cast<ViewID>(i), true);
   }