Linux: More gcc 4.5 NULL versus 0 fixes.

chrome/browser/net/gaia/token_service.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/gaia/token_service.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/net/gaia/gaia_authenticator2.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_service.h"
 
 // Unfortunately kNumServices must be defined in the .h.
 // TODO(chron): Sync doesn't use the TalkToken anymore so we can stop
 //              requesting it.
 const char* TokenService::kServices[] = {GaiaConstants::kSyncService,
                                          GaiaConstants::kTalkService};
 TokenService::TokenService()
-    : token_loading_query_(NULL) {
+    : token_loading_query_(0) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 }
 
 TokenService::~TokenService() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   ResetCredentialsInMemory();
 }
 
 void TokenService::Initialize(const char* const source,
                               Profile* profile) {
@@ skipping 17 matching lines @@
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // Terminate any running fetchers. Callbacks will not return.
   for (int i = 0; i < kNumServices; i++) {
     fetchers_[i].reset();
   }
 
   // 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();
   credentials_ = GaiaAuthConsumer::ClientLoginResult();
 }
 
 void TokenService::UpdateCredentials(
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   credentials_ = credentials;
@@ skipping 104 matching lines @@
     const GoogleServiceAuthError& error) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   LOG(WARNING) << "Auth token issuing failed for service:" << service;
   FireTokenRequestFailedNotification(service, error);
 }
 
 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.
   if (result) {
     DCHECK(result->GetType() == TOKEN_RESULT);
     const WDResult<std::map<std::string, std::string> > * token_result =
         static_cast<const WDResult<std::map<std::string, std::string> > * > (
             result);
     LoadTokensIntoMemory(token_result->GetValue(), &token_map_);
   }
@@ skipping 33 matching lines @@
 }
 
 void TokenService::Observe(NotificationType type,
                            const NotificationSource& source,
                            const NotificationDetails& details) {
   DCHECK(type == NotificationType::TOKEN_UPDATED);
   TokenAvailableDetails* tok_details =
       Details<TokenAvailableDetails>(details).ptr();
   OnIssueAuthTokenSuccess(tok_details->service(), tok_details->token());
 }