Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5842)

Unified Diff: chrome/browser/chromeos/cros_settings.cc

Issue 9703115: Add DeviceSettingProvider unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed copyright header. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/device_settings_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/cros_settings.cc
diff --git a/chrome/browser/chromeos/cros_settings.cc b/chrome/browser/chromeos/cros_settings.cc
index fe11ff62c83256209e86bf5c4264b1149be647f7..547e60f62a43f7568ec9b653e6d8ae3bfc9828a5 100644
--- a/chrome/browser/chromeos/cros_settings.cc
+++ b/chrome/browser/chromeos/cros_settings.cc
@@ -12,6 +12,7 @@
#include "base/values.h"
#include "chrome/browser/chromeos/cros_settings_provider.h"
#include "chrome/browser/chromeos/device_settings_provider.h"
+#include "chrome/browser/chromeos/login/signed_settings_helper.h"
#include "chrome/browser/chromeos/stub_cros_settings_provider.h"
#include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
#include "chrome/common/chrome_notification_types.h"
@@ -281,7 +282,8 @@ CrosSettings::CrosSettings() {
switches::kStubCrosSettings)) {
AddSettingsProvider(new StubCrosSettingsProvider(notify_cb));
} else {
- AddSettingsProvider(new DeviceSettingsProvider(notify_cb));
+ AddSettingsProvider(
+ new DeviceSettingsProvider(notify_cb, SignedSettingsHelper::Get()));
}
// System settings are not mocked currently.
AddSettingsProvider(new options2::SystemSettingsProvider(notify_cb));
« no previous file with comments | « no previous file | chrome/browser/chromeos/device_settings_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698