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

Unified Diff: chrome/browser/chromeos/settings/device_settings_test_helper.cc

Issue 12538009: Public Sessions: fetch device robot api token during enterprise enrollment. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: updated tests Created 7 years, 8 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
Index: chrome/browser/chromeos/settings/device_settings_test_helper.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index b2a97858c536f686a3fa889be018b512193e47d3..4abb76244b6b9dbd5393293e92e2e7a410bd6e30 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -31,10 +31,10 @@ void DeviceSettingsTestHelper::FlushLoops() {
void DeviceSettingsTestHelper::FlushStore() {
std::vector<StorePolicyCallback> callbacks;
- callbacks.swap(device_policy_.store_callbacks_);
+ callbacks.swap(policy_state_.store_callbacks_);
for (std::vector<StorePolicyCallback>::iterator cb(callbacks.begin());
cb != callbacks.end(); ++cb) {
- cb->Run(device_policy_.store_result_);
+ cb->Run(policy_state_.store_result_);
}
std::map<std::string, PolicyState>::iterator device_local_account_state;
@@ -51,10 +51,10 @@ void DeviceSettingsTestHelper::FlushStore() {
void DeviceSettingsTestHelper::FlushRetrieve() {
std::vector<RetrievePolicyCallback> callbacks;
- callbacks.swap(device_policy_.retrieve_callbacks_);
+ callbacks.swap(policy_state_.retrieve_callbacks_);
for (std::vector<RetrievePolicyCallback>::iterator cb(callbacks.begin());
cb != callbacks.end(); ++cb) {
- cb->Run(device_policy_.policy_blob_);
+ cb->Run(policy_state_.policy_blob_);
}
std::map<std::string, PolicyState>::iterator device_local_account_state;
@@ -80,7 +80,7 @@ void DeviceSettingsTestHelper::Flush() {
}
bool DeviceSettingsTestHelper::HasPendingOperations() const {
- if (device_policy_.HasPendingOperations())
+ if (policy_state_.HasPendingOperations())
return true;
std::map<std::string, PolicyState>::const_iterator device_local_account_state;
@@ -127,7 +127,7 @@ void DeviceSettingsTestHelper::NotifyLockScreenDismissed() {}
void DeviceSettingsTestHelper::RetrieveDevicePolicy(
const RetrievePolicyCallback& callback) {
- device_policy_.retrieve_callbacks_.push_back(callback);
+ policy_state_.retrieve_callbacks_.push_back(callback);
}
void DeviceSettingsTestHelper::RetrieveUserPolicy(
@@ -144,8 +144,8 @@ void DeviceSettingsTestHelper::RetrieveDeviceLocalAccountPolicy(
void DeviceSettingsTestHelper::StoreDevicePolicy(
const std::string& policy_blob,
const StorePolicyCallback& callback) {
- device_policy_.policy_blob_ = policy_blob;
- device_policy_.store_callbacks_.push_back(callback);
+ policy_state_.policy_blob_ = policy_blob;
+ policy_state_.store_callbacks_.push_back(callback);
}
void DeviceSettingsTestHelper::StoreUserPolicy(

Powered by Google App Engine
This is Rietveld 408576698