2 files changed, 13 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
index bbe6335..84e840c 100644
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
@@ -7,6 +7,7 @@
 #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)
@@ -16,10 +17,9 @@
 
 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;
 
@@ -46,7 +46,7 @@ bool IsEnhancedBookmarkImageFetchingEnabled(const PrefService* user_prefs) {
   // 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)
@@ -83,8 +83,8 @@ bool IsEnableDomDistillerSet() {
           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;
@@ -95,8 +95,8 @@ bool IsEnableSyncArticlesSet() {
           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;
diff --git a/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc b/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
index 44e308a..62417927 100644
--- a/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
+++ b/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
@@ -23,6 +23,7 @@
 #include "components/bookmarks/common/android/bookmark_type.h"
 #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h"
 #include "components/enhanced_bookmarks/enhanced_bookmark_model.h"
+#include "components/enhanced_bookmarks/enhanced_bookmark_utils.h"
 #include "components/enhanced_bookmarks/image_record.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
@@ -313,6 +314,10 @@ bool EnhancedBookmarksBridge::IsEditable(const BookmarkNode* node) const {
         bookmarks::prefs::kEditBookmarksEnabled);
 }
 
+static jint GetDefaultViewMode(JNIEnv* env, jclass jcaller) {
+  return enhanced_bookmarks::GetDefaultViewMode();
+}
+
 static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) {
   return reinterpret_cast<jlong>(new EnhancedBookmarksBridge(
         env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));