diff options
| author | dantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 00:27:11 +0000 |
|---|---|---|
| committer | dantasse@chromium.org <dantasse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 00:27:11 +0000 |
| commit | 4af84b6a1a7bdcef99d83fa38024554966e7e7a4 (patch) | |
| tree | 277c84e8fd677fb99e7c1c7932b77232c5b0f3b1 /chrome/browser/sync | |
| parent | 56f33994c2a8de4f240c77b324426f652a5497d7 (diff) | |
| download | chromium_src-4af84b6a1a7bdcef99d83fa38024554966e7e7a4.zip chromium_src-4af84b6a1a7bdcef99d83fa38024554966e7e7a4.tar.gz chromium_src-4af84b6a1a7bdcef99d83fa38024554966e7e7a4.tar.bz2 | |
Switch the order of two checks to avoid dereferencing a null RequestContext
TBR=tim@chromium.org
BUG=32085,32084
TEST=none
Review URL: http://codereview.chromium.org/561064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 77f8b6f..0c2ea66 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -71,8 +71,8 @@ void ProfileSyncService::Initialize() { // behavior, so we don't want the sync service to start. // profile()->GetRequestContext() also checks if this is in a test. if (browser_defaults::kBootstrapSyncAuthentication && - !GetLsidForAuthBootstraping().empty() && - profile()->GetRequestContext()) + profile()->GetRequestContext() && + !GetLsidForAuthBootstraping().empty()) StartUp(); // We always start sync for Chrome OS. } else { StartUp(); |