Restored an option to enable enhanced bookmarks experiment from Finch

chrome/browser/bookmarks/enhanced_bookmarks_features.cc

 // Copyright 2013 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/bookmarks/enhanced_bookmarks_features.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sha1.h"
@@ skipping 25 matching lines @@
     experiments_list->Remove(
         base::StringValue(switches::kManualEnhancedBookmarksOptout), &index);
     experiments_list->AppendIfNotPresent(
         new base::StringValue(switches::kManualEnhancedBookmarks));
   } else if (bookmarks_experiment_state ==
                  kBookmarksExperimentEnabledUserOptOut) {
     experiments_list->Remove(
         base::StringValue(switches::kManualEnhancedBookmarks), &index);
     experiments_list->AppendIfNotPresent(
         new base::StringValue(switches::kManualEnhancedBookmarksOptout));
+  } else if (bookmarks_experiment_state ==
+             kBookmarksExperimentEnabledFromFinch) {
+    experiments_list->Remove(
+        base::StringValue(switches::kManualEnhancedBookmarks), &index);
+    experiments_list->Remove(
+        base::StringValue(switches::kManualEnhancedBookmarksOptout), &index);
   }
 }
 
 bool IsEnhancedBookmarksExperimentEnabled() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kManualEnhancedBookmarks) ||
       command_line->HasSwitch(switches::kManualEnhancedBookmarksOptout)) {
     return true;
   }
 
+  return IsEnhancedBookmarksExperimentEnabledFromFinch();
+}
+
+bool IsEnhancedBookmarksExperimentEnabledFromFinch() {
   std::string ext_id = GetEnhancedBookmarksExtensionIdFromFinch();
   extensions::FeatureProvider* feature_provider =
       extensions::FeatureProvider::GetPermissionFeatures();
   extensions::Feature* feature = feature_provider->GetFeature("metricsPrivate");
   return feature && feature->IsIdInWhitelist(ext_id);
 }
 
 bool IsEnableDomDistillerSet() {
   if (CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableDomDistiller)) {
@@ skipping 14 matching lines @@
   if (chrome_variations::GetVariationParamValue(
           kFieldTrialName, "enable-sync-articles") == "1")
     return true;
 
   return false;
 }
 
 std::string GetEnhancedBookmarksExtensionIdFromFinch() {
   return chrome_variations::GetVariationParamValue(kFieldTrialName, "id");
 }