diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 17:03:01 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 17:03:01 +0000 |
| commit | 8570f64d53309cce2081ee4dc1553e4714dc076d (patch) | |
| tree | 8d1b5a18c6fea36248131998794ed219d8098643 /chrome/browser/policy | |
| parent | b488b5a5fcda73c803142a551914dcccdb5d84da (diff) | |
| download | chromium_src-8570f64d53309cce2081ee4dc1553e4714dc076d.zip chromium_src-8570f64d53309cce2081ee4dc1553e4714dc076d.tar.gz chromium_src-8570f64d53309cce2081ee4dc1553e4714dc076d.tar.bz2 | |
Make sure permanent policy errors are correctly propagated and consumed.
BUG=chromium-os:31573
TEST=unit and browser tests should still pass.
Review URL: https://chromiumcodereview.appspot.com/10541027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/device_policy_cache.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/policy/device_policy_cache.cc b/chrome/browser/policy/device_policy_cache.cc index d1b666b..931178e 100644 --- a/chrome/browser/policy/device_policy_cache.cc +++ b/chrome/browser/policy/device_policy_cache.cc @@ -343,8 +343,10 @@ void DevicePolicyCache::InstallInitialPolicy( } void DevicePolicyCache::SetTokenAndFlagReady(const std::string& device_token) { - // Wait for device settings to become available. - if (chromeos::CrosSettingsProvider::TRUSTED != + // Make sure that we only start device policy fetches once device settings are + // available in order to ensure the first device policy fetch uploads the + // configured reporting bits. + if (chromeos::CrosSettingsProvider::TEMPORARILY_UNTRUSTED == chromeos::CrosSettings::Get()->PrepareTrustedValues( base::Bind(&DevicePolicyCache::SetTokenAndFlagReady, weak_ptr_factory_.GetWeakPtr(), |