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

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index f7e1fa0b7e1d2bf0fdec0316caf5f159e18145e9..64b0de2cf69df5e5b01fd08010cc07287cd5d4a4 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -79,6 +79,10 @@
 #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;
@@ -933,9 +937,7 @@ void ProfileSyncService::OnExperimentsChanged(
     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
@@ -960,9 +962,7 @@ void ProfileSyncService::OnExperimentsChanged(
   // 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.
@@ -970,17 +970,11 @@ void ProfileSyncService::OnExperimentsChanged(
 #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;
 }
@@ -2027,3 +2021,21 @@ void ProfileSyncService::ResetForTest() {
       signin,
       behavior);
 }
+
+void ProfileSyncService::SetExperimentFlag(const std::string& experiment) {
+#if defined(OS_CHROMEOS)
+  if (chromeos::UserManager::Get()->IsCurrentUserOwner()) {
+    about_flags::SetExperimentEnabled(NULL,
+                                      "sync-tab-favicons",

[Nicolas Zea, 2013/03/08 18:56:21]

shouldn't this be the experiment string?

[pastarmovj, 2013/03/11 09:47:24]

Of course :) bad copy paste...bad

+                                      true);
+  } else {
+    about_flags::SetExperimentEnabled(profile_->GetPrefs(),
+                                      "sync-tab-favicons",
+                                      true);
+  }
+#else
+  about_flags::SetExperimentEnabled(g_browser_process->local_state(),
+                                    "sync-tab-favicons",
+                                    true);
+#endif
+}