[Android] Use correct enhanced bookmarks enabling logic.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index dd4c1f9c9600da76e5626866c1da98918963d572..1f1220ecb7601d6cfa423d9661791005f43474e7 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1625,7 +1625,7 @@ const Experiment kExperiments[] = {
     "manual-enhanced-bookmarks",
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
-    kOsDesktop,
+    kOsDesktop | kOsAndroid,
     SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarks)
   },
   {
@@ -2028,6 +2028,21 @@ bool SkipConditionalExperiment(const Experiment& experiment) {
 
     return !IsEnhancedBookmarksExperimentEnabled();
   }
+
+#if defined(OS_ANDROID)
+  // manual-enhanced-bookmarks is available for the Android internal channels.
+  // For other combinations, falls back to the default logic below.
+  if (experiment.internal_name == std::string("manual-enhanced-bookmarks")) {
+    switch (chrome::VersionInfo::GetChannel()) {
+      case chrome::VersionInfo::CHANNEL_UNKNOWN:
+      case chrome::VersionInfo::CHANNEL_CANARY:
+      case chrome::VersionInfo::CHANNEL_DEV:

[Nico, 2014/08/25 00:49:35]

Flags shouldn't be channel-specific. See also the discussion from
https://codereview.chromium.org/203473003/#msg39 to the end of that thread.

+        return false;
+      default:
+        break;
+    }
+  }
+#endif
   if ((experiment.internal_name == std::string("manual-enhanced-bookmarks")) ||
       (experiment.internal_name ==
            std::string("manual-enhanced-bookmarks-optout"))) {