Force Enhanced Bookmark to be enabled if command line flags are set true

chrome/browser/bookmarks/enhanced_bookmarks_features.h

Index: chrome/browser/bookmarks/enhanced_bookmarks_features.h
diff --git a/chrome/browser/bookmarks/enhanced_bookmarks_features.h b/chrome/browser/bookmarks/enhanced_bookmarks_features.h
index 8e6a98701678473f7693b6ca247dbb33a3f2220c..84183122ac2fdadd68cd24b3c48de5c1c5e3e33e 100644
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.h
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.h
@@ -11,10 +11,6 @@
 
 class PrefService;
 
-// Returns true and sets |extension_id| if enhanced bookmarks experiment is
-// enabled. Returns false if no bookmark experiment or extension id is empty.
-bool GetBookmarksExperimentExtensionID(std::string* extension_id);
-
 #if defined(OS_ANDROID)
 // Returns true if enhanced bookmark salient image prefetching is enabled.
 // This can be controlled by field trial.
@@ -22,9 +18,14 @@ bool IsEnhancedBookmarkImageFetchingEnabled(const PrefService* user_prefs);
 
 // Returns true if enhanced bookmarks is enabled.
 bool IsEnhancedBookmarksEnabled();
-
 #endif
 
+// Returns true and sets |extension_id| if enhanced bookmarks experiment is
+// enabled. Returns false if no bookmark experiment or extension id is empty.
+// Besides, this method takes commandline flags into account before trying
+// to get an extension_id.
+bool IsEnhancedBookmarksEnabled(std::string* extension_id);
+
 // Returns true when flag enable-dom-distiller is set or enabled from Finch.
 bool IsEnableDomDistillerSet();