google_apis: Use stl utilities from the base namespace

google_apis/gaia/account_tracker.cc

 // Copyright 2014 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 "google_apis/gaia/account_tracker.h"
 
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 10 matching lines @@
   identity_provider_->AddObserver(this);
   identity_provider_->GetTokenService()->AddObserver(this);
 }
 
 AccountTracker::~AccountTracker() {
   DCHECK(shutdown_called_);
 }
 
 void AccountTracker::Shutdown() {
   shutdown_called_ = true;
-  STLDeleteValues(&user_info_requests_);
+  base::STLDeleteValues(&user_info_requests_);
   identity_provider_->GetTokenService()->RemoveObserver(this);
   identity_provider_->RemoveObserver(this);
 }
 
 bool AccountTracker::IsAllUserInfoFetched() const {
   return user_info_requests_.empty();
 }
 
 void AccountTracker::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
@@ skipping 156 matching lines @@
     NotifySignInChanged(account);
 }
 
 void AccountTracker::StartTrackingAccount(const std::string& account_key) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AccountTracker::StartTrackingAccount"));
 
-  if (!ContainsKey(accounts_, account_key)) {
+  if (!base::ContainsKey(accounts_, account_key)) {
     DVLOG(1) << "StartTracking " << account_key;
     AccountState account_state;
     account_state.ids.account_key = account_key;
     account_state.ids.email = account_key;
     account_state.is_signed_in = false;
     accounts_.insert(make_pair(account_key, account_state));
   }
 }
 
 void AccountTracker::StopTrackingAccount(const std::string account_key) {
   DVLOG(1) << "StopTracking " << account_key;
-  if (ContainsKey(accounts_, account_key)) {
+  if (base::ContainsKey(accounts_, account_key)) {
     AccountState& account = accounts_[account_key];
     if (!account.ids.gaia.empty()) {
       UpdateSignInState(account_key, false);
       NotifyAccountRemoved(account);
     }
     accounts_.erase(account_key);
   }
 
-  if (ContainsKey(user_info_requests_, account_key))
+  if (base::ContainsKey(user_info_requests_, account_key))
     DeleteFetcher(user_info_requests_[account_key]);
 }
 
 void AccountTracker::StopTrackingAllAccounts() {
   while (!accounts_.empty())
     StopTrackingAccount(accounts_.begin()->first);
 }
 
 void AccountTracker::StartFetchingUserInfo(const std::string& account_key) {
   // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460 is
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AccountTracker::StartFetchingUserInfo"));
 
-  if (ContainsKey(user_info_requests_, account_key)) {
+  if (base::ContainsKey(user_info_requests_, account_key)) {
     // TODO(robliao): Remove ScopedTracker below once https://crbug.com/422460
     // is fixed.
     tracked_objects::ScopedTracker tracking_profile1(
         FROM_HERE_WITH_EXPLICIT_FUNCTION(
             "422460 AccountTracker::StartFetchingUserInfo 1"));
 
     DeleteFetcher(user_info_requests_[account_key]);
   }
 
   DVLOG(1) << "StartFetching " << account_key;
@@ skipping 15 matching lines @@
   tracked_objects::ScopedTracker tracking_profile3(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 AccountTracker::StartFetchingUserInfo 3"));
 
   fetcher->Start();
 }
 
 void AccountTracker::OnUserInfoFetchSuccess(AccountIdFetcher* fetcher,
                                             const std::string& gaia_id) {
   const std::string& account_key = fetcher->account_key();
-  DCHECK(ContainsKey(accounts_, account_key));
+  DCHECK(base::ContainsKey(accounts_, account_key));
   AccountState& account = accounts_[account_key];
 
   account.ids.gaia = gaia_id;
   NotifyAccountAdded(account);
 
   if (account.is_signed_in)
     NotifySignInChanged(account);
 
   DeleteFetcher(fetcher);
 }
 
 void AccountTracker::OnUserInfoFetchFailure(AccountIdFetcher* fetcher) {
   LOG(WARNING) << "Failed to get UserInfo for " << fetcher->account_key();
   std::string key = fetcher->account_key();
   DeleteFetcher(fetcher);
   StopTrackingAccount(key);
 }
 
 void AccountTracker::DeleteFetcher(AccountIdFetcher* fetcher) {
   DVLOG(1) << "DeleteFetcher " << fetcher->account_key();
   const std::string& account_key = fetcher->account_key();
-  DCHECK(ContainsKey(user_info_requests_, account_key));
+  DCHECK(base::ContainsKey(user_info_requests_, account_key));
   DCHECK_EQ(fetcher, user_info_requests_[account_key]);
   user_info_requests_.erase(account_key);
   delete fetcher;
 }
 
 AccountIdFetcher::AccountIdFetcher(
     OAuth2TokenService* token_service,
     net::URLRequestContextGetter* request_context_getter,
     AccountTracker* tracker,
     const std::string& account_key)
@@ skipping 67 matching lines @@
                                "AccountIdFetcher",
                                this,
                                "OnNetworkError",
                                "response_code",
                                response_code);
   LOG(ERROR) << "OnNetworkError " << response_code;
   tracker_->OnUserInfoFetchFailure(this);
 }
 
 }  // namespace gaia