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 5b7b38a0ad83f2f05834fa83963eb2405895ae35..a3ad240aab47495a2200ac853bd9f5359cc6191b 100644 |
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc |
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc |
@@ -50,12 +50,12 @@ bool IsEnhancedBookmarkImageFetchingEnabled(const PrefService* user_prefs) { |
kFieldTrialName, "DisableImagesFetching"); |
return disable_fetching.empty(); |
} |
+#endif |
bool IsEnhancedBookmarksEnabled() { |
std::string extension_id; |
return IsEnhancedBookmarksEnabled(&extension_id); |
} |
-#endif |
bool IsEnhancedBookmarksEnabled(std::string* extension_id) { |
// kEnhancedBookmarksExperiment flag could have values "", "1" and "0". |
@@ -66,13 +66,12 @@ bool IsEnhancedBookmarksEnabled(std::string* extension_id) { |
#if defined(OS_ANDROID) |
opt_out |= base::android::BuildInfo::GetInstance()->sdk_int() < |
base::android::SdkVersion::SDK_VERSION_ICE_CREAM_SANDWICH_MR1; |
- |
- // Android tests use command line flag to force enhanced bookmark to be on. |
+#endif |
+ // Tests use command line flag to force enhanced bookmark to be on. |
bool opt_in = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
switches::kEnhancedBookmarksExperiment) == "1"; |
if (opt_in) |
return true; |
-#endif |
if (opt_out) |
return false; |