[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..ece68370f90f47e7ae49cc6e86f591321011abbc 100644
--- a/chrome/browser/chromeos/cros_settings.cc
+++ b/chrome/browser/chromeos/cros_settings.cc
@@ -4,13 +4,17 @@
 
 #include "chrome/browser/chromeos/cros_settings.h"
 
+#include "base/bind.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"
@@ -29,11 +33,10 @@ bool CrosSettings::IsCrosSettings(const std::string& path) {
   return StartsWithASCII(path, kCrosSettingsPrefix, true);
 }
 
-void CrosSettings::FireObservers(const char* path) {
+void CrosSettings::FireObservers(const std::string& path) {
   DCHECK(CalledOnValidThread());
-  std::string path_str(path);
   SettingsObserverMap::iterator observer_iterator =
-      settings_observers_.find(path_str);
+      settings_observers_.find(path);
   if (observer_iterator == settings_observers_.end())
     return;
 
@@ -42,7 +45,7 @@ void CrosSettings::FireObservers(const char* path) {
   while ((observer = it.GetNext()) != NULL) {
     observer->Observe(chrome::NOTIFICATION_SYSTEM_SETTING_CHANGED,
                       content::Source<CrosSettings>(this),
-                      content::Details<std::string>(&path_str));
+                      content::Details<const std::string>(&path));
   }
 }
 
@@ -263,8 +266,16 @@ bool CrosSettings::GetList(const std::string& path,
 }
 
 CrosSettings::CrosSettings() {
-  AddSettingsProvider(new SystemSettingsProvider());
-  AddSettingsProvider(new DeviceSettingsProvider());
+  CrosSettingsProvider::NotifyObserversCallback notify_cb(
+      base::Bind(&CrosSettings::FireObservers,
+                 // This is safe since |this| is never deleted.
+                 base::Unretained(this)));
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kStubCrosSettings)) {
+    AddSettingsProvider(new StubCrosSettingsProvider(notify_cb));
+  }
+  AddSettingsProvider(new SystemSettingsProvider(notify_cb));

[pastarmovj, 2011/12/13 13:41:07]

You might even want to put the real providers in an else clause to avoid having
to reload them which might not work well in test environment without proper
mocking.

[Ivan Korotkov, 2011/12/13 14:46:16]

Done for Device provider (System provider is not mocked for now anyway).

+  AddSettingsProvider(new DeviceSettingsProvider(notify_cb));
 }
 
 CrosSettings::~CrosSettings() {