diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 11:01:38 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 11:01:38 +0000 |
| commit | e9cc7240adee07d4dc9da8137c080c86a6ad9b58 (patch) | |
| tree | 1dcc895baa8a5f5f68343b9815b146ef7c24d8fb | |
| parent | 3a6a8f5375cfd94c1161c5f21d5efc471a92451f (diff) | |
| download | chromium_src-e9cc7240adee07d4dc9da8137c080c86a6ad9b58.zip chromium_src-e9cc7240adee07d4dc9da8137c080c86a6ad9b58.tar.gz chromium_src-e9cc7240adee07d4dc9da8137c080c86a6ad9b58.tar.bz2 | |
Fix chromeos browser_tests crash by skipping EnsurePrivateKey if device is not owned.
BUG=none.
TEST=ChromeOS buildbot should be green.
TBR=cmasone@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58339 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/ownership_service.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/ownership_service.cc b/chrome/browser/chromeos/login/ownership_service.cc index 2f1b92a..e85bed2 100644 --- a/chrome/browser/chromeos/login/ownership_service.cc +++ b/chrome/browser/chromeos/login/ownership_service.cc @@ -96,7 +96,7 @@ void OwnershipService::StartVerifyAttempt(const std::string& data, bool OwnershipService::CurrentUserIsOwner() { // If this user has the private key associated with the owner's // public key, this user is the owner. - return manager_->EnsurePrivateKey(); + return IsAlreadyOwned() && manager_->EnsurePrivateKey(); } } // namespace chromeos |