[Android] Check if enhanced bookmarks id is set by finch.

chrome/browser/bookmarks/enhanced_bookmarks_features.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 10 matching lines @@
 
 const char kFieldTrialName[] = "EnhancedBookmarks";
 
 // Get extension id from Finch EnhancedBookmarks group parameters.
 std::string GetEnhancedBookmarksExtensionIdFromFinch() {
   return variations::GetVariationParamValue(kFieldTrialName, "id");
 }
 
 // Returns true if enhanced bookmarks experiment is enabled from Finch.
 bool IsEnhancedBookmarksExperimentEnabledFromFinch() {
+  std::string ext_id = GetEnhancedBookmarksExtensionIdFromFinch();

[sky, 2014/08/12 23:17:21]

nit: const

[Kibeom Kim (inactive), 2014/08/12 23:33:38]

Done.

 #if defined(OS_ANDROID)
-  return false;
-#endif
-  std::string ext_id = GetEnhancedBookmarksExtensionIdFromFinch();
+  return !ext_id.empty();
+#else
   const extensions::FeatureProvider* feature_provider =
       extensions::FeatureProvider::GetPermissionFeatures();
   extensions::Feature* feature = feature_provider->GetFeature("metricsPrivate");
   return feature && feature->IsIdInWhitelist(ext_id);
+#endif
 }
 
 };  // namespace
 
 bool GetBookmarksExperimentExtensionID(const PrefService* user_prefs,
                                        std::string* extension_id) {
   BookmarksExperimentState bookmarks_experiment_state =
       static_cast<BookmarksExperimentState>(user_prefs->GetInteger(
           sync_driver::prefs::kEnhancedBookmarksExperimentEnabled));
   if (bookmarks_experiment_state == BOOKMARKS_EXPERIMENT_ENABLED_FROM_FINCH) {
@@ skipping 160 matching lines @@
   if (CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableSyncArticles)) {
     return true;
   }
   if (variations::GetVariationParamValue(
           kFieldTrialName, "enable-sync-articles") == "1")
     return true;
 
   return false;
 }