[cros] Add --stub-cros-settings option for testing.

chrome/browser/chromeos/cros_settings.cc

Index: chrome/browser/chromeos/cros_settings.cc
diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc
index 8d54cbd3418baa48e1e4e6ad6a52002c2e538546..f72496bb10b633813ad9f8d1ce88114e3fe120a3 100644
--- a/chrome/browser/chromeos/cros_settings.cc
+++ b/chrome/browser/chromeos/cros_settings.cc
@@ -4,13 +4,16 @@
 
 #include "chrome/browser/chromeos/cros_settings.h"
 
+#include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/device_settings_provider.h"
+#include "chrome/browser/chromeos/stub_cros_settings_provider.h"
 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
@@ -263,6 +266,9 @@ bool CrosSettings::GetList(const std::string& path,
 }
 
 CrosSettings::CrosSettings() {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kStubCrosSettings))

[Nikita (slow), 2011/12/12 11:04:57]

nit: Multiline condition requires { } block.

[Ivan Korotkov, 2011/12/13 13:15:09]

Done.

+    AddSettingsProvider(new StubCrosSettingsProvider());
   AddSettingsProvider(new SystemSettingsProvider());
   AddSettingsProvider(new DeviceSettingsProvider());
 }