diff options
| author | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 17:54:04 +0000 |
|---|---|---|
| committer | craig.schlenter@chromium.org <craig.schlenter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-14 17:54:04 +0000 |
| commit | 90caf65af4eaa06b4c72bc22ba46363633b94029 (patch) | |
| tree | 52c9aef4a2ab03de91720619eef7b0c5b8b668ed /chrome/browser | |
| parent | 8157198176d0e92bc2a1b9892c70b11b1f7be8ba (diff) | |
| download | chromium_src-90caf65af4eaa06b4c72bc22ba46363633b94029.zip chromium_src-90caf65af4eaa06b4c72bc22ba46363633b94029.tar.gz chromium_src-90caf65af4eaa06b4c72bc22ba46363633b94029.tar.bz2 | |
Linux: More gcc 4.5 NULL versus 0 fixes.
BUG=49533
TEST=compiles with gcc 4.5 and on trybots.
Review URL: http://codereview.chromium.org/3433005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/net/gaia/token_service.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc index b61ab62..9562e34 100644 --- a/chrome/browser/net/gaia/token_service.cc +++ b/chrome/browser/net/gaia/token_service.cc @@ -18,7 +18,7 @@ const char* TokenService::kServices[] = {GaiaConstants::kSyncService, GaiaConstants::kTalkService}; TokenService::TokenService() - : token_loading_query_(NULL) { + : token_loading_query_(0) { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); } @@ -56,7 +56,7 @@ void TokenService::ResetCredentialsInMemory() { // Cancel pending loads. Callbacks will not return. if (token_loading_query_) { web_data_service_->CancelRequest(token_loading_query_); - token_loading_query_ = NULL; + token_loading_query_ = 0; } token_map_.clear(); @@ -181,7 +181,7 @@ void TokenService::OnWebDataServiceRequestDone(WebDataService::Handle h, const WDTypedResult* result) { DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI)); DCHECK(token_loading_query_); - token_loading_query_ = NULL; + token_loading_query_ = 0; // If the fetch failed, there will be no result. In that case, we just don't // load any tokens at all from the DB. |