Enable Chrome To Mobile by default; disable via chrome://flags.

This re-enables Chrome To Mobile on trunk/M20 for now.

I'm not reverting crrev.com/129552 (disable CL) in order to keep the AboutFlags_enable-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 (not M19).

Review URL: https://chromiumcodereview.appspot.com/9969063

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

5 files changed, 8 insertions, 14 deletions

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 3c1d35b..e635a10 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -637,11 +637,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage)
   },
   {
-    "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)
   },
 };
 
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc
index 0d1141a..cb704b2 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -37,7 +37,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;
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
index 13a8429..405c295 100644
--- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
+++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm
@@ -69,14 +69,11 @@ class ViewIDTest : public InProcessBrowserTest {
           i == VIEW_ID_AUTOCOMPLETE ||
           i == VIEW_ID_CONTENTS_SPLIT ||
           i == VIEW_ID_FEEDBACK_BUTTON ||
-          i == VIEW_ID_OMNIBOX) {
+          i == VIEW_ID_OMNIBOX ||
+          i == VIEW_ID_CHROME_TO_MOBILE_BUTTON) {
         continue;
       }
 
-      // Chrome To Mobile is disabled by default.
-      if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON)
-        continue;
-
       CheckViewID(static_cast<ViewID>(i), true);
     }
 
diff --git a/chrome/browser/ui/gtk/view_id_util_browsertest.cc b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
index 579567b..d460cf2 100644
--- a/chrome/browser/ui/gtk/view_id_util_browsertest.cc
+++ b/chrome/browser/ui/gtk/view_id_util_browsertest.cc
@@ -47,10 +47,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);
   }
 
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index 2ce1809a..fcba0e6 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -7,6 +7,7 @@
 0x4da52e00bdfac86a	AboutFlags_cloud-print-proxy
 0xc5ec36aaa32ceff4	AboutFlags_confirm-to-quit
 0x4e8fe1c674de45dd	AboutFlags_conflicting-modules-check
+0x4ebeea0717b98e89	AboutFlags_disable-chrome-to-mobile
 0xe9d2339d6b9225c7	AboutFlags_disable-outdated-plugins
 0xf73b5212b48e2a75	AboutFlags_disable-print-preview
 0xdddbf34cee2c636c	AboutFlags_dns-server