[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 ce9dfaff9e528a4947aa503d7559e543934851c6..1b65f1c2f17890f0fe23d3e6a6b89c302ae72bcd 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1604,7 +1604,7 @@ const Experiment kExperiments[] = {
     "enhanced-bookmarks-experiment",
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
-    kOsDesktop,
+    kOsDesktop | kOsAndroid,
     ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
         switches::kEnhancedBookmarksExperiment, "1",
         switches::kEnhancedBookmarksExperiment, "0")
@@ -1613,14 +1613,14 @@ 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)
   },
   {
     "manual-enhanced-bookmarks-optout",
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
-    kOsDesktop,
+    kOsDesktop | kOsAndroid,
     SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarksOptout)
   },
 #if defined(OS_ANDROID)
@@ -2025,6 +2025,10 @@ void GetSanitizedEnabledFlags(
 bool SkipConditionalExperiment(const Experiment& experiment) {

[Nico, 2014/08/27 21:52:39]

This whole function looks wrong to me. Why does enhanced-bookmarks-experiment
need special-casing at all?

(The enable-data-reduction-proxy-dev check below looks wrong too.)

[Kibeom Kim (inactive), 2014/08/28 18:31:00]

So the logic was added here. https://codereview.chromium.org/68173031 . To my
understanding, the purpose was to show the opt-out flag only if we are running
an experiment for the user, by chrome sync or finch. Maybe yefim@ can comment,
but I think if we show the flag always, it can mess up the stats we're
monitoring.

[Kibeom Kim (inactive), 2014/09/03 06:53:13]

I confirmed with Mark and Yefim. If user is not in the experiment group, by
finch or Chrome sync, the flag doesn't do anything so there is no reason to show
to the user.

   if (experiment.internal_name ==
       std::string("enhanced-bookmarks-experiment")) {
+#if defined(OS_ANDROID)
+      // On Android, user can opt in.
+      return false;
+#else
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     // Dont't skip experiment if it has non default value.
     // It means user selected it.
@@ -2032,7 +2036,9 @@ bool SkipConditionalExperiment(const Experiment& experiment) {
       return false;
 
     return !IsEnhancedBookmarksExperimentEnabled();
+#endif
   }
+
   if ((experiment.internal_name == std::string("manual-enhanced-bookmarks")) ||
       (experiment.internal_name ==
            std::string("manual-enhanced-bookmarks-optout"))) {