Revert 186837 "Move pref backing up flags from local state to de..."

chrome/browser/about_flags.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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 25 matching lines @@
 
 #if defined(ENABLE_MESSAGE_CENTER)
 #include "ui/message_center/message_center_switches.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_switches.h"
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 using content::UserMetricsAction;
 
 namespace about_flags {
 
 // Macros to simplify specifying the type.
 #define SINGLE_VALUE_TYPE_AND_VALUE(command_line_switch, switch_value) \
     Experiment::SINGLE_VALUE, \
@@ skipping 1243 matching lines @@
     return Singleton<FlagsState>::get();
   }
 
  private:
   bool needs_restart_;
   std::map<std::string, std::string> flags_switches_;
 
   DISALLOW_COPY_AND_ASSIGN(FlagsState);
 };
 
-#if defined(OS_CHROMEOS)
-// Extracts the list of enabled lab experiments from device settings and stores
-// them in a set.
-void GetEnabledFlagsFromDeviceSettings(std::set<std::string>* result) {
-  const ListValue* enabled_experiments;
-  if (!chromeos::CrosSettings::Get()->GetList(chromeos::kStartUpFlags,
-                                              &enabled_experiments)) {
-    return;
-  }
-
-  for (ListValue::const_iterator it = enabled_experiments->begin();
-       it != enabled_experiments->end();
-       ++it) {
-    std::string experiment_name;
-    if (!(*it)->GetAsString(&experiment_name)) {
-      LOG(WARNING) << "Invalid entry in " << chromeos::kStartUpFlags;
-      continue;
-    }
-    result->insert(experiment_name);
-  }
-}
-
-// Takes a set of enabled lab experiments and saves it into the device settings
-// storage on ChromeOS.
-void SetEnabledFlagsToDeviceSettings(
-    const std::set<std::string>& enabled_experiments) {
-  scoped_ptr<base::ListValue> experiments_list(new base::ListValue());
-
-  for (std::set<std::string>::const_iterator it = enabled_experiments.begin();
-       it != enabled_experiments.end();
-       ++it) {
-    experiments_list->Append(new StringValue(*it));
-  }
-  chromeos::CrosSettings::Get()->Set(chromeos::kStartUpFlags,
-                                     *experiments_list);
-}
-#endif
-
 // Extracts the list of enabled lab experiments from preferences and stores them
-// in a set. On ChromeOS |prefs| can be NULL when reading machine level flags.
+// in a set.
 void GetEnabledFlags(const PrefService* prefs, std::set<std::string>* result) {
-#if defined(OS_CHROMEOS)
-  // On ChromeOS flags are stored in the device settings blob.
-  if (!prefs) {
-    GetEnabledFlagsFromDeviceSettings(result);
-    return;
-  }
-#else
-  // Never allow |prefs| to be NULL on other platforms.
-  CHECK(prefs);
-#endif
-
   const ListValue* enabled_experiments = prefs->GetList(
       prefs::kEnabledLabsExperiments);
   if (!enabled_experiments)
     return;
 
   for (ListValue::const_iterator it = enabled_experiments->begin();
        it != enabled_experiments->end();
        ++it) {
     std::string experiment_name;
     if (!(*it)->GetAsString(&experiment_name)) {
       LOG(WARNING) << "Invalid entry in " << prefs::kEnabledLabsExperiments;
       continue;
     }
     result->insert(experiment_name);
   }
 }
 
-// Takes a set of enabled lab experiments. On ChromeOS |prefs| can be NULL when
-// setting machine level flags.
+// Takes a set of enabled lab experiments
 void SetEnabledFlags(
     PrefService* prefs, const std::set<std::string>& enabled_experiments) {
-#if defined(OS_CHROMEOS)
-  // On ChromeOS flags are stored in the device settings blob.
-  if (!prefs) {
-    SetEnabledFlagsToDeviceSettings(enabled_experiments);
-    return;
-  }
-#else
-  // Never allow |prefs| to be NULL on other platforms.
-  CHECK(prefs);
-#endif
-
   ListPrefUpdate update(prefs, prefs::kEnabledLabsExperiments);
   ListValue* experiments_list = update.Get();
 
   experiments_list->Clear();
   for (std::set<std::string>::const_iterator it = enabled_experiments.begin();
        it != enabled_experiments.end();
        ++it) {
     experiments_list->Append(new StringValue(*it));
   }
 }
@@ skipping 419 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags