Index: chrome/browser/about_flags.cc |
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc |
index 299acb1d112eb6aeab3d7acc739445d8db14295a..e0b7c08707e6b37d4cad0e26be32e6d2198c7a73 100644 |
--- a/chrome/browser/about_flags.cc |
+++ b/chrome/browser/about_flags.cc |
@@ -2126,22 +2126,6 @@ void GetSanitizedEnabledFlags( |
bool SkipConditionalExperiment(const Experiment& experiment, |
FlagsStorage* flags_storage) { |
- if (experiment.internal_name == |
- std::string("enhanced-bookmarks-experiment")) { |
-#if defined(OS_ANDROID) |
noyau (Ping after 24h)
2014/10/31 01:43:44
You can put " || defined(OS_IOS) in there as well.
|
- // On Android, user can opt in. |
- return false; |
-#else |
- CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- // Dont't skip experiment if it has non default value. |
- // It means user selected it. |
- if (command_line->HasSwitch(switches::kEnhancedBookmarksExperiment)) |
- return false; |
- |
- return !IsEnhancedBookmarksExperimentEnabled(flags_storage); |
-#endif |
- } |
- |
if ((experiment.internal_name == std::string("manual-enhanced-bookmarks")) || |
(experiment.internal_name == |
std::string("manual-enhanced-bookmarks-optout"))) { |