Remove enhanced bookmarks sync experiment

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>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/base/switches.h"
-#include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/flags_storage.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/cloud_devices/common/cloud_devices_switches.h"
 #include "components/metrics/metrics_hashes.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/omnibox/omnibox_switches.h"
 #include "components/proximity_auth/switches.h"
@@ skipping 1636 matching lines @@
 #endif
   {
     "enhanced-bookmarks-experiment",
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
     IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
     kOsDesktop | kOsAndroid,
     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 | kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarks)
-  },
-  {
-    "manual-enhanced-bookmarks-optout",
-    IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_NAME,
-    IDS_FLAGS_ENABLE_ENHANCED_BOOKMARKS_DESCRIPTION,
-    kOsDesktop | kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kManualEnhancedBookmarksOptout)
-  },
 #if defined(OS_ANDROID)
   {
     "enable-zero-suggest-experiment",
     IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_NAME,
     IDS_FLAGS_ZERO_SUGGEST_EXPERIMENT_DESCRIPTION,
     kOsAndroid,
     MULTI_VALUE_TYPE(kZeroSuggestExperimentsChoices)
   },
   {
     "enable-reader-mode-toolbar-icon",
@@ skipping 664 matching lines @@
     flags_storage->SetFlags(new_enabled_experiments);
 }
 
 void GetSanitizedEnabledFlags(
     FlagsStorage* flags_storage, std::set<std::string>* result) {
   SanitizeList(flags_storage);
   *result = flags_storage->GetFlags();
 }
 
 bool SkipConditionalExperiment(const Experiment& experiment,
                                FlagsStorage* flags_storage) {

[danduong, 2015/03/18 03:16:03]

Can we drop flags_stoage here from the list of params?

-  if ((experiment.internal_name == std::string("manual-enhanced-bookmarks")) ||
-      (experiment.internal_name ==
-           std::string("manual-enhanced-bookmarks-optout"))) {
-    return true;
-  }
-
 #if defined(OS_ANDROID) || defined(ENABLE_DATA_REDUCTION_PROXY_DEBUGGING)
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
 #endif
 
 #if defined(OS_ANDROID)
   // enable-data-reduction-proxy-dev is only available for the Dev/Beta channel.
   if (!strcmp("enable-data-reduction-proxy-dev", experiment.internal_name) &&
       channel != chrome::VersionInfo::CHANNEL_BETA &&
       channel != chrome::VersionInfo::CHANNEL_DEV) {
     return true;
@@ skipping 332 matching lines @@
                                             std::string()));
   }
   for (const std::string& experiment_name : enabled_experiments) {
     NameToSwitchAndValueMap::const_iterator name_to_switch_it =
         name_to_switch_map.find(experiment_name);
     if (name_to_switch_it == name_to_switch_map.end()) {
       NOTREACHED();
       continue;
     }
 
-#if defined(OS_CHROMEOS)
-    // On Chrome OS setting command line flag may make browser to restart on
-    // user login. As this flag eventually will be set to a significant number
-    // of users skip manual-enhanced-bookmarks to avoid restart.
-    if (experiment_name == "manual-enhanced-bookmarks")
-      continue;
-#endif
-
     const std::pair<std::string, std::string>&
         switch_and_value_pair = name_to_switch_it->second;
 
     CHECK(!switch_and_value_pair.first.empty());
     command_line->AppendSwitchASCII(switch_and_value_pair.first,
                                     switch_and_value_pair.second);
     flags_switches_[switch_and_value_pair.first] = switch_and_value_pair.second;
   }
   if (sentinels == kAddSentinels) {
     command_line->AppendSwitch(switches::kFlagSwitchesEnd);
@@ skipping 111 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags