[Android] Use correct enhanced bookmarks enabling logic.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 1598 matching lines @@
     "enable-apps-show-on-first-paint",
     IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_NAME,
     IDS_FLAGS_ENABLE_APPS_SHOW_ON_FIRST_PAINT_DESCRIPTION,
     kOsDesktop,
     SINGLE_VALUE_TYPE(extensions::switches::kEnableAppsShowOnFirstPaint)
   },
   {
     "enhanced-bookmarks-experiment",
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
     kOsDesktop,

[Yaron, 2014/08/22 01:13:14]

Why is this one not | kOsAndroid also?

[Kibeom Kim (inactive), 2014/08/22 07:40:37]

Yes, this and below #1632 should also have kOsAndroid eventually.

But for this CL I'm just trying to expose the flag we're using to chrome://flags
so that people can turn on without rooting.

I was thinking of using enhanced_bookmarks_features.h later when we are OK to
turn on by default, because that logic assumes setting the flag is opt out and
also reported as UMA, so changing that assumption only for Android seemed
non-trivial. I can try this route if you think it's better.

     ENABLE_DISABLE_VALUE_TYPE_AND_VALUE(
         switches::kEnhancedBookmarksExperiment, "1",
         switches::kEnhancedBookmarksExperiment, "0")
   },
   {
     "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,
     SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarksOptout)
   },
 #if defined(OS_ANDROID)
@@ skipping 382 matching lines @@
   if (experiment.internal_name ==
       std::string("enhanced-bookmarks-experiment")) {
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     // Dont't skip experiment if it has non default value.
     // It means user selected it.
     if (command_line->HasSwitch(switches::kEnhancedBookmarksExperiment))
       return false;
 
     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"))) {
     return true;
   }
 
 #if defined(OS_ANDROID)
   // enable-data-reduction-proxy-dev is only available for the Dev channel.
   if (!strcmp("enable-data-reduction-proxy-dev", experiment.internal_name) &&
       chrome::VersionInfo::GetChannel() != chrome::VersionInfo::CHANNEL_DEV) {
@@ skipping 445 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags