[Android] Add enhanced bookmarks grid/list view experiment.

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 "chrome/common/chrome_switches.h"
+#include "components/enhanced_bookmarks/enhanced_bookmark_utils.h"
 #include "components/variations/variations_associated_data.h"
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/feature_provider.h"
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 namespace {
 
-const char kFieldTrialName[] = "EnhancedBookmarks";
-
 bool GetBookmarksExperimentExtensionID(std::string* extension_id) {
-  *extension_id = variations::GetVariationParamValue(kFieldTrialName, "id");
+  *extension_id = variations::GetVariationParamValue(
+      enhanced_bookmarks::kFieldTrialName, "id");
   if (extension_id->empty())
     return false;
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
   return true;
 #else
   const extensions::FeatureProvider* feature_provider =
       extensions::FeatureProvider::GetPermissionFeatures();
   extensions::Feature* feature = feature_provider->GetFeature("metricsPrivate");
   return feature && feature->IsIdInWhitelist(*extension_id);
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 
 }  // namespace
 
 #if defined(OS_ANDROID)
 bool IsEnhancedBookmarkImageFetchingEnabled(const PrefService* user_prefs) {
   if (IsEnhancedBookmarksEnabled())
     return true;
 
   // Salient images are collected from visited bookmarked pages even if the
   // enhanced bookmark feature is turned off. This is to have some images
   // available so that in the future, when the feature is turned on, the user
   // experience is not a big list of flat colors. However as a precautionary
   // measure it is possible to disable this collection of images from finch.
   std::string disable_fetching = variations::GetVariationParamValue(
-      kFieldTrialName, "DisableImagesFetching");
+      enhanced_bookmarks::kFieldTrialName, "DisableImagesFetching");
   return disable_fetching.empty();
 }
 #endif  // defined(OS_ANDROID)
 
 bool IsEnhancedBookmarksEnabled() {
   std::string extension_id;
   return IsEnhancedBookmarksEnabled(&extension_id);
 }
 
 bool IsEnhancedBookmarksEnabled(std::string* extension_id) {
@@ skipping 16 matching lines @@
     return false;
 
   return GetBookmarksExperimentExtensionID(extension_id);
 }
 
 bool IsEnableDomDistillerSet() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableDomDistiller)) {
     return true;
   }
-  if (variations::GetVariationParamValue(
-          kFieldTrialName, "enable-dom-distiller") == "1")
+  if (variations::GetVariationParamValue(enhanced_bookmarks::kFieldTrialName,
+                                         "enable-dom-distiller") == "1")
     return true;
 
   return false;
 }
 
 bool IsEnableSyncArticlesSet() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSyncArticles)) {
     return true;
   }
-  if (variations::GetVariationParamValue(
-          kFieldTrialName, "enable-sync-articles") == "1")
+  if (variations::GetVariationParamValue(enhanced_bookmarks::kFieldTrialName,
+                                         "enable-sync-articles") == "1")
     return true;
 
   return false;
 }