diff options
| author | stevenjb <stevenjb@chromium.org> | 2016-02-24 12:42:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-24 20:44:28 +0000 |
| commit | 6c9db5f91e463b362258634356f4d3bca897f0ef (patch) | |
| tree | 80f6faac99182e092bbf854a9a6d2ecb819bbdd6 /chromeos | |
| parent | 32a7684cf7c1173c11ab012591c8cca2d31df52a (diff) | |
| download | chromium_src-6c9db5f91e463b362258634356f4d3bca897f0ef.zip chromium_src-6c9db5f91e463b362258634356f4d3bca897f0ef.tar.gz chromium_src-6c9db5f91e463b362258634356f4d3bca897f0ef.tar.bz2 | |
Revert of Reland: No longer start up profile if there was an error fetching policy. (patchset #1 id:1 of https://codereview.chromium.org/1727413002/ )
Reason for revert:
Still causing failures here:
https://uberchromegw.corp.google.com/i/chromeos.chrome/builders/Lumpy%20%28chrome%29/builds/18722
It's possible that the telemetry fixes have not propagated to the builder yet.
Original issue's description:
> Reland: No longer start up profile if there was an error fetching policy.
>
> Changed UserCloudPolicyManagerChromeOS to no longer complete profile
> initialization if there is an error fetching policy. Instead, we shutdown the
> user and force a policy load the next time we try to startup that user.
>
> BUG=532317
> TBR=vitalybuka@chromium.org
>
> Committed: https://crrev.com/01a589c605a9ead2754a51a5ef2c916361c6be0d
> Cr-Commit-Position: refs/heads/master@{#377288}
TBR=vitalybuka@chromium.org,tnagel@google.com,atwilson@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=532317
Review URL: https://codereview.chromium.org/1737453003
Cr-Commit-Position: refs/heads/master@{#377371}
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_switches.cc | 5 | ||||
| -rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index afb9b83f..249cfab 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -12,11 +12,6 @@ namespace chromeos { namespace switches { -// If this flag is passed, failed policy fetches will not cause profile -// initialization to fail. This is useful for tests because it means that -// tests don't have to mock out the policy infrastructure. -const char kAllowFailedPolicyFetchForTest[] = - "allow-failed-policy-fetch-for-test"; // Allows remote attestation (RA) in dev mode for testing purpose. Usually RA // is disabled in dev mode because it will always fail. However, there are cases diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index ee53d4e..4d7a5de 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -21,7 +21,6 @@ namespace switches { // see chromeos::LoginUtil::GetOffTheRecordCommandLine().) // Please keep alphabetized. -CHROMEOS_EXPORT extern const char kAllowFailedPolicyFetchForTest[]; CHROMEOS_EXPORT extern const char kAllowRAInDevMode[]; CHROMEOS_EXPORT extern const char kAppOemManifestFile[]; CHROMEOS_EXPORT extern const char kArtifactsDir[]; |