[Enhanced Bookmarks] Make enhanced bookmarks default for Android.

components/enhanced_bookmarks/enhanced_bookmark_features.cc

Index: components/enhanced_bookmarks/enhanced_bookmark_features.cc
diff --git a/components/enhanced_bookmarks/enhanced_bookmark_features.cc b/components/enhanced_bookmarks/enhanced_bookmark_features.cc
index 5ca31914ac062d0464f6f965c8cb140c8893be93..b3f3491342cdbe5886c3c88a74949b3193701cff 100644
--- a/components/enhanced_bookmarks/enhanced_bookmark_features.cc
+++ b/components/enhanced_bookmarks/enhanced_bookmark_features.cc
@@ -11,21 +11,12 @@
 #include "components/offline_pages/offline_page_feature.h"

[jianli, 2015/12/03 23:30:04]

nit: you can include this include

[jianli, 2015/12/03 23:30:38]

sorry, I mean to remove this include

[Kibeom Kim (inactive), 2015/12/03 23:36:39]

Done.

 #include "components/variations/variations_associated_data.h"
 
-#if defined(OS_IOS) || defined(OS_ANDROID)
-
 namespace enhanced_bookmarks {
 namespace {
 const char kFieldTrialName[] = "EnhancedBookmarks";
 }  // namespace
 
 bool IsEnhancedBookmarksEnabled() {
-#if defined(OS_ANDROID)
-  // If offline pages feature is enabled, also enable enhanced bookmarks feature
-  // regardless its state.
-  if (offline_pages::IsOfflinePagesEnabled())
-    return true;
-#endif
-
   // 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.
@@ -44,5 +35,3 @@ bool IsEnhancedBookmarksEnabled() {
 }
 
 }  // namespace enhanced_bookmarks
-
-#endif