From 47684233b141700ac710afdff7fa08e6f121c725 Mon Sep 17 00:00:00 2001
From: skyostil <skyostil@chromium.org>
Date: Fri, 12 Aug 2016 06:06:38 -0700
Subject: [PATCH] google_apis: Use stl utilities from the base namespace

The utilities in base/stl_util.h have been moved from the global
into the base namespace. This patch updates the call sites accordingly.

No functional changes.

BUG=636301

Review-Url: https://codereview.chromium.org/2229413002
Cr-Commit-Position: refs/heads/master@{#411629}
---
 google_apis/drive/request_sender.cc      |  4 ++--
 google_apis/gaia/account_tracker.cc      | 14 +++++++-------
 google_apis/gaia/oauth2_token_service.cc |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/google_apis/drive/request_sender.cc b/google_apis/drive/request_sender.cc
index 2f8b4c8bf88689..fc275352d76b59 100644
--- a/google_apis/drive/request_sender.cc
+++ b/google_apis/drive/request_sender.cc
@@ -27,8 +27,8 @@ RequestSender::RequestSender(
 
 RequestSender::~RequestSender() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  STLDeleteContainerPointers(in_flight_requests_.begin(),
-                             in_flight_requests_.end());
+  base::STLDeleteContainerPointers(in_flight_requests_.begin(),
+                                   in_flight_requests_.end());
 }
 
 base::Closure RequestSender::StartRequestWithAuthRetry(
diff --git a/google_apis/gaia/account_tracker.cc b/google_apis/gaia/account_tracker.cc
index 83aed2fb2d86d4..0a2cce054d3178 100644
--- a/google_apis/gaia/account_tracker.cc
+++ b/google_apis/gaia/account_tracker.cc
@@ -28,7 +28,7 @@ AccountTracker::~AccountTracker() {
 
 void AccountTracker::Shutdown() {
   shutdown_called_ = true;
-  STLDeleteValues(&user_info_requests_);
+  base::STLDeleteValues(&user_info_requests_);
   identity_provider_->GetTokenService()->RemoveObserver(this);
   identity_provider_->RemoveObserver(this);
 }
@@ -205,7 +205,7 @@ void AccountTracker::StartTrackingAccount(const std::string& account_key) {
       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;
@@ -217,7 +217,7 @@ void AccountTracker::StartTrackingAccount(const std::string& account_key) {
 
 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);
@@ -226,7 +226,7 @@ void AccountTracker::StopTrackingAccount(const std::string account_key) {
     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]);
 }
 
@@ -242,7 +242,7 @@ void AccountTracker::StartFetchingUserInfo(const std::string& account_key) {
       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(
@@ -278,7 +278,7 @@ void AccountTracker::StartFetchingUserInfo(const std::string& account_key) {
 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;
@@ -300,7 +300,7 @@ void AccountTracker::OnUserInfoFetchFailure(AccountIdFetcher* fetcher) {
 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;
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc
index 8c703a14179024..163670105f0686 100644
--- a/google_apis/gaia/oauth2_token_service.cc
+++ b/google_apis/gaia/oauth2_token_service.cc
@@ -398,8 +398,8 @@ OAuth2TokenService::OAuth2TokenService(OAuth2TokenServiceDelegate* delegate)
 
 OAuth2TokenService::~OAuth2TokenService() {
   // Release all the pending fetchers.
-  STLDeleteContainerPairSecondPointers(
-      pending_fetchers_.begin(), pending_fetchers_.end());
+  base::STLDeleteContainerPairSecondPointers(pending_fetchers_.begin(),
+                                             pending_fetchers_.end());
 }
 
 OAuth2TokenServiceDelegate* OAuth2TokenService::GetDelegate() {