Adjust the profile sync service to properly set per user or per machine flags.

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2012 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/sync/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 61 matching lines @@
 #include "sync/js/js_event_details.h"
 #include "sync/notifier/invalidator_registrar.h"
 #include "sync/notifier/invalidator_state.h"
 #include "sync/util/cryptographer.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_ANDROID)
 #include "sync/internal_api/public/read_transaction.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/user_manager.h"
+#endif
+
 using browser_sync::ChangeProcessor;
 using browser_sync::DataTypeController;
 using browser_sync::DataTypeManager;
 using browser_sync::SyncBackendHost;
 using syncer::ModelType;
 using syncer::ModelTypeSet;
 using syncer::JsBackend;
 using syncer::JsController;
 using syncer::JsEventDetails;
 using syncer::JsEventHandler;
@@ skipping 834 matching lines @@
     // Received notice to enable experimental type. Check if the type is
     // registered, and if not register a new datatype controller.
     RegisterNewDataType(it.Get());
     // Enable the about:flags switch for the experimental type so we don't have
     // to always perform this reconfiguration. Once we set this, the type will
     // remain registered on restart, so we will no longer go down this code
     // path.
     std::string experiment_name = GetExperimentNameForDataType(it.Get());
     if (experiment_name.empty())
       continue;
-    about_flags::SetExperimentEnabled(g_browser_process->local_state(),
-                                      experiment_name,
-                                      true);
+    SetExperimentFlag(experiment_name);
   }
 
   // Check if the user has "Keep Everything Synced" enabled. If so, we want
   // to turn on all experimental types if they're not already on. Otherwise we
   // leave them off.
   // Note: if any types are already registered, we don't turn them on. This
   // covers the case where we're already in the process of reconfiguring
   // to turn an experimental type on.
   if (sync_prefs_.HasKeepEverythingSynced()) {
     // Mark all data types as preferred.
     sync_prefs_.SetPreferredDataTypes(registered_types, registered_types);
 
     // Only automatically turn on types if we have already finished set up.
     // Otherwise, just leave the experimental types on by default.
     if (!to_register.Empty() && HasSyncSetupCompleted() && migrator_.get()) {
       DVLOG(1) << "Dynamically enabling new datatypes: "
                << syncer::ModelTypeSetToString(to_register);
       OnMigrationNeededForTypes(to_register);
     }
   }
 
   // Now enable any non-datatype features.
   if (experiments.sync_tab_favicons) {
     DVLOG(1) << "Enabling syncing of tab favicons.";
-    about_flags::SetExperimentEnabled(g_browser_process->local_state(),
-                                      "sync-tab-favicons",
-                                      true);
+    SetExperimentFlag("sync-tab-favicons");
 #if defined(OS_ANDROID)
     // Android does not support about:flags and experiments, so we need to force
     // setting the experiments as command line switches.
     CommandLine::ForCurrentProcess()->AppendSwitch(switches::kSyncTabFavicons);
 #endif
   }
 
-  if (experiments.keystore_encryption) {
-    about_flags::SetExperimentEnabled(g_browser_process->local_state(),
-                                      syncer::kKeystoreEncryptionFlag,
-                                      true);
-  }
+  if (experiments.keystore_encryption)
+    SetExperimentFlag(syncer::kKeystoreEncryptionFlag);
 
-  if (experiments.full_history_sync) {
-    about_flags::SetExperimentEnabled(g_browser_process->local_state(),
-                                      syncer::kFullHistorySyncFlag,
-                                      true);
-  }
+  if (experiments.full_history_sync)
+    SetExperimentFlag(syncer::kFullHistorySyncFlag);
 
   current_experiments_ = experiments;
 }
 
 void ProfileSyncService::UpdateAuthErrorState(const AuthError& error) {
   is_auth_in_progress_ = false;
   last_auth_error_ = error;
 
   // Fan the notification out to interested UI-thread components. Notify the
   // SigninGlobalError first so it reflects the latest auth state before we
@@ skipping 1026 matching lines @@
   // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefined-behaviour-after-directly-calling-the-destru.
   ProfileSyncService* old_this = this;
   this->~ProfileSyncService();
   new(old_this) ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       signin,
       behavior);
 }
+
+void ProfileSyncService::SetExperimentFlag(const std::string& experiment) {
+#if defined(OS_CHROMEOS)
+  if (chromeos::UserManager::Get()->IsCurrentUserOwner())
+    about_flags::SetExperimentEnabled(NULL, experiment, true);
+  else
+    about_flags::SetExperimentEnabled(profile_->GetPrefs(), experiment, true);
+#else
+  about_flags::SetExperimentEnabled(g_browser_process->local_state(),
+                                    experiment,
+                                    true);
+#endif
+}