Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Unified Diff: chrome/browser/net/gaia/token_service.cc

Issue 3433005: Linux: More gcc 4.5 NULL versus 0 fixes. (Closed)
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/spdy/spdy_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/net/gaia/token_service.cc
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc
index b61ab62ec8b7cd07a0cb8edfa7c4c98aab5e1882..9562e3404a324b0387763d27b604714b3903a265 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.
« no previous file with comments | « no previous file | net/spdy/spdy_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698