[Android] Use correct enhanced bookmarks enabling logic.

chrome/browser/bookmarks/enhanced_bookmarks_features.cc

Index: chrome/browser/bookmarks/enhanced_bookmarks_features.cc
diff --git a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
index aad3817e1bcacbf3786729c87ccb50b76c88132b..aa7b7b7faeb42aa543dfb78abb39608e1130c7b8 100644
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
@@ -179,8 +179,8 @@ bool IsEnhancedBookmarksExperimentEnabled() {
 }
 
 #if defined(OS_ANDROID)
-bool IsEnhancedBookmarkImageFetchingEnabled() {
-  if (IsEnhancedBookmarksExperimentEnabled())
+bool IsEnhancedBookmarkImageFetchingEnabled(const PrefService* user_prefs) {
+  if (IsEnhancedBookmarksEnabled(user_prefs))
     return true;
 
   // Salient images are collected from visited bookmarked pages even if the
@@ -192,6 +192,14 @@ bool IsEnhancedBookmarkImageFetchingEnabled() {
       kFieldTrialName, "DisableImagesFetching");
   return disable_fetching.empty();
 }
+
+bool IsEnhancedBookmarksEnabled(const PrefService* user_prefs) {
+  BookmarksExperimentState bookmarks_experiment_state =
+      static_cast<BookmarksExperimentState>(user_prefs->GetInteger(
+          sync_driver::prefs::kEnhancedBookmarksExperimentEnabled));
+  return bookmarks_experiment_state == BOOKMARKS_EXPERIMENT_ENABLED
+      || bookmarks_experiment_state == BOOKMARKS_EXPERIMENT_ENABLED_FROM_FINCH;

[sky, 2014/09/03 21:26:20]

nit: I believe style guide says || should be on previous line.

[Kibeom Kim (inactive), 2014/09/03 21:32:22]

Done.

+}
 #endif
 
 bool IsEnableDomDistillerSet() {