Consolidated enhanced bookmarks experiment logic in one place.

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 37 matching lines @@
   }
   if (bookmarks_experiment_state == kBookmarksExperimentEnabled) {
     *extension_id = user_prefs->GetString(
         sync_driver::prefs::kEnhancedBookmarksExtensionId);
     return !extension_id->empty();
   }
 
   return false;
 }
 
-void UpdateBookmarksExperimentState(PrefService* user_prefs,
-                                    PrefService* local_state,
-                                    bool user_signed_in) {
+void UpdateBookmarksExperimentState(
+    PrefService* user_prefs,
+    PrefService* local_state,
+    bool user_signed_in,
+    BookmarksExperimentState experiment_enabled_from_sync) {
  PrefService* flags_storage = local_state;
 #if defined(OS_CHROMEOS)
   // Chrome OS is using user prefs for flags storage.
   flags_storage = user_prefs;
 #endif
 
   BookmarksExperimentState bookmarks_experiment_state_before =
       static_cast<BookmarksExperimentState>(user_prefs->GetInteger(
           sync_driver::prefs::kEnhancedBookmarksExperimentEnabled));
   // If user signed out, clear possible previous state.
   if (!user_signed_in) {
     bookmarks_experiment_state_before = kNoBookmarksExperiment;
     ForceFinchBookmarkExperimentIfNeeded(flags_storage, kNoBookmarksExperiment);
   }
 
   // kEnhancedBookmarksExperiment flag could have values "", "1" and "0".
   // "0" - user opted out.
   bool opt_out = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
                      switches::kEnhancedBookmarksExperiment) == "0";
 
   BookmarksExperimentState bookmarks_experiment_new_state =
       kNoBookmarksExperiment;
-  bool enabled_from_finch = false;
-  if (IsEnhancedBookmarksExperimentEnabledFromFinch()) {
-    enabled_from_finch = !user_signed_in;
-    if (user_signed_in) {
-      bookmarks_experiment_new_state =
-          kBookmarksExperimentEnabledFromFinchUserSignedIn;
-    }
-  }
 
-  if (enabled_from_finch) {
+  if (IsEnhancedBookmarksExperimentEnabledFromFinch() && !user_signed_in) {
     if (opt_out) {
       // Experiment enabled but user opted out.
       bookmarks_experiment_new_state = kBookmarksExperimentOptOutFromFinch;
     } else {
       // Experiment enabled.
       bookmarks_experiment_new_state = kBookmarksExperimentEnabledFromFinch;
     }
+  } else if (experiment_enabled_from_sync == kBookmarksExperimentEnabled) {

[sky, 2014/05/23 19:51:56]

How about a switch here?

+    // Experiment enabled from Chrome sync.
+    if (opt_out) {
+      // Experiment enabled but user opted out.
+      bookmarks_experiment_new_state = kBookmarksExperimentEnabledUserOptOut;
+    } else {
+      // Experiment enabled.
+      bookmarks_experiment_new_state = kBookmarksExperimentEnabled;
+    }
+  } else if (experiment_enabled_from_sync == kNoBookmarksExperiment) {
+    // Experiment is not enabled from Chrome sync.
+    bookmarks_experiment_new_state = kNoBookmarksExperiment;
   } else if (bookmarks_experiment_state_before == kBookmarksExperimentEnabled) {
     if (opt_out) {
       // Experiment enabled but user opted out.
       bookmarks_experiment_new_state = kBookmarksExperimentEnabledUserOptOut;
     } else {
       bookmarks_experiment_new_state = kBookmarksExperimentEnabled;
     }
   } else if (bookmarks_experiment_state_before ==
              kBookmarksExperimentEnabledUserOptOut) {
     if (opt_out) {
       bookmarks_experiment_new_state = kBookmarksExperimentEnabledUserOptOut;
     } else {
       // User opted in again.
       bookmarks_experiment_new_state = kBookmarksExperimentEnabled;
     }
   }
 
   UMA_HISTOGRAM_ENUMERATION("EnhancedBookmarks.SyncExperimentState",
                             bookmarks_experiment_new_state,
                             kBookmarksExperimentEnumSize);
   user_prefs->SetInteger(
       sync_driver::prefs::kEnhancedBookmarksExperimentEnabled,
       bookmarks_experiment_new_state);
-  if (bookmarks_experiment_state_before != bookmarks_experiment_new_state)
-    ForceFinchBookmarkExperimentIfNeeded(flags_storage,
-                                         bookmarks_experiment_new_state);
+  ForceFinchBookmarkExperimentIfNeeded(flags_storage,
+                                       bookmarks_experiment_new_state);
 }
 
 void ForceFinchBookmarkExperimentIfNeeded(
     PrefService* flags_storage,
     BookmarksExperimentState bookmarks_experiment_state) {
   if (!flags_storage)
     return;
   ListPrefUpdate update(flags_storage, prefs::kEnabledLabsExperiments);
   base::ListValue* experiments_list = update.Get();
   if (!experiments_list)
@@ skipping 44 matching lines @@
   if (CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kEnableSyncArticles)) {
     return true;
   }
   if (chrome_variations::GetVariationParamValue(
           kFieldTrialName, "enable-sync-articles") == "1")
     return true;
 
   return false;
 }