| 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 f441a62a398af2461bc8583c0ab1216c6f6f5ffb..1992640e967b934469bd68af88ca166631565d03 100644
|
| --- a/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
|
| +++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.cc
|
| @@ -87,7 +87,7 @@ void UpdateBookmarksExperimentState(
|
|
|
| // kEnhancedBookmarksExperiment flag could have values "", "1" and "0".
|
| // "0" - user opted out.
|
| - bool opt_out = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| + bool opt_out = base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| switches::kEnhancedBookmarksExperiment) == "0";
|
|
|
| BookmarksExperimentState bookmarks_experiment_new_state =
|
| @@ -135,9 +135,9 @@ void UpdateBookmarksExperimentState(
|
| }
|
|
|
| #if defined(OS_ANDROID)
|
| - bool opt_in = !opt_out
|
| - && CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| - switches::kEnhancedBookmarksExperiment) == "1";
|
| + bool opt_in = !opt_out &&
|
| + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| + switches::kEnhancedBookmarksExperiment) == "1";
|
| if (opt_in && bookmarks_experiment_new_state == BOOKMARKS_EXPERIMENT_NONE)
|
| bookmarks_experiment_new_state = BOOKMARKS_EXPERIMENT_ENABLED;
|
| #endif
|
| @@ -202,7 +202,7 @@ bool IsEnhancedBookmarksExperimentEnabled(
|
| if (flags.find(switches::kManualEnhancedBookmarksOptout) != flags.end())
|
| return true;
|
| #else
|
| - CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| if (command_line->HasSwitch(switches::kManualEnhancedBookmarks) ||
|
| command_line->HasSwitch(switches::kManualEnhancedBookmarksOptout)) {
|
| return true;
|
| @@ -237,8 +237,8 @@ bool IsEnhancedBookmarksEnabled(const PrefService* user_prefs) {
|
| #endif
|
|
|
| bool IsEnableDomDistillerSet() {
|
| - if (CommandLine::ForCurrentProcess()->
|
| - HasSwitch(switches::kEnableDomDistiller)) {
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableDomDistiller)) {
|
| return true;
|
| }
|
| if (variations::GetVariationParamValue(
|
| @@ -249,8 +249,8 @@ bool IsEnableDomDistillerSet() {
|
| }
|
|
|
| bool IsEnableSyncArticlesSet() {
|
| - if (CommandLine::ForCurrentProcess()->
|
| - HasSwitch(switches::kEnableSyncArticles)) {
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableSyncArticles)) {
|
| return true;
|
| }
|
| if (variations::GetVariationParamValue(
|
|
|