Enable enhanced bookmarks by default on iOS.

ios/chrome/browser/experimental_flags.mm

 // Copyright 2015 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.
 
 // This file can be empty. Its purpose is to contain the relatively short lived
 // definitions required for experimental flags.
 
 #include "ios/chrome/browser/experimental_flags.h"
 
 #include <dispatch/dispatch.h>
 #import <Foundation/Foundation.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "components/autofill/core/common/autofill_switches.h"
-#include "components/enhanced_bookmarks/enhanced_bookmark_features.h"
+#include "components/enhanced_bookmarks/enhanced_bookmark_switches.h"
 #include "components/variations/variations_associated_data.h"
 #include "ios/chrome/browser/chrome_switches.h"
 #include "ios/web/public/web_view_creation_util.h"
 
 namespace {
 NSString* const kEnableAlertOnBackgroundUpload =
     @"EnableAlertsOnBackgroundUpload";
 NSString* const kEnableViewCopyPasswords = @"EnableViewCopyPasswords";
 NSString* const kHeuristicsForPasswordGeneration =
     @"HeuristicsForPasswordGeneration";
@@ skipping 11 matching lines @@
 }  // namespace
 
 namespace experimental_flags {
 
 bool IsAlertOnBackgroundUploadEnabled() {
   return [[NSUserDefaults standardUserDefaults]
       boolForKey:kEnableAlertOnBackgroundUpload];
 }
 
 bool IsBookmarkCollectionEnabled() {
-  return enhanced_bookmarks::IsEnhancedBookmarksEnabled();
+  // kEnhancedBookmarksExperiment flag could have values "", "1" and "0".
+  // "" - default, "0" - user opted out, "1" - user opted in.  Tests also use
+  // the command line flag to force enhanced bookmark to be on.
+  // If none is specified, the finch experiment is checked. If not disabled in
+  // finch, the default is opt-in.
+  std::string switch_value =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kEnhancedBookmarksExperiment);
+  if (switch_value == "1")
+    return true;
+  if (switch_value == "0")
+    return false;
+
+  // Check if the finch experiment is turned on.
+  std::string group_name =
+      base::FieldTrialList::FindFullName("IOSNewBookmarksUI");
+  return !base::StartsWith(group_name, "Disabled",
+                           base::CompareCase::INSENSITIVE_ASCII);
 }
 
 void SetWKWebViewTrialEligibility(bool eligible) {
   // It's critical that the enabled state be consistently reported throughout
   // the life of the app, so ensure that this has not already been set.
   DCHECK(g_wkwebview_trial_eligibility == WKWebViewEligibility::UNSET);
 
   g_wkwebview_trial_eligibility = eligible ? WKWebViewEligibility::ELIGIBLE
                                            : WKWebViewEligibility::INELIGIBLE;
 }
@@ skipping 143 matching lines @@
   if ([[NSUserDefaults standardUserDefaults]
           boolForKey:kHeuristicsForPasswordGeneration]) {
     return true;
   }
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(
       autofill::switches::kLocalHeuristicsOnlyForPasswordGeneration);
 }
 
 }  // namespace experimental_flags