Remove ScopedVector from chrome/browser/.

chrome/browser/signin/mutable_profile_oauth2_token_service_delegate.cc

 // Copyright 2015 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/signin/mutable_profile_oauth2_token_service_delegate.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/profiler/scoped_tracker.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/browser/webdata/token_web_data.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/webdata/common/web_data_service_base.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/oauth2_access_token_fetcher_immediate_error.h"
@@ skipping 73 matching lines @@
 }
 
 MutableProfileOAuth2TokenServiceDelegate::RevokeServerRefreshToken::
     ~RevokeServerRefreshToken() {
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::RevokeServerRefreshToken::
     OnOAuth2RevokeTokenCompleted() {
   // |this| pointer will be deleted when removed from the vector, so don't
   // access any members after call to erase().
-  token_service_delegate_->server_revokes_.erase(
-      std::find(token_service_delegate_->server_revokes_.begin(),
-                token_service_delegate_->server_revokes_.end(), this));
+  token_service_delegate_->server_revokes_.erase(std::find_if(
+      token_service_delegate_->server_revokes_.begin(),
+      token_service_delegate_->server_revokes_.end(),
+      [this](const std::unique_ptr<MutableProfileOAuth2TokenServiceDelegate::
+                                       RevokeServerRefreshToken>& item) {
+        return item.get() == this;
+      }));
 }
 
 MutableProfileOAuth2TokenServiceDelegate::AccountStatus::AccountStatus(
     SigninErrorController* signin_error_controller,
     const std::string& account_id,
     const std::string& refresh_token)
     : signin_error_controller_(signin_error_controller),
       account_id_(account_id),
       refresh_token_(refresh_token),
       last_auth_error_(GoogleServiceAuthError::NONE) {
@@ skipping 419 matching lines @@
     VLOG(1) << "MutablePO2TS::ClearPersistedCredentials for account_id="
             << account_id;
     token_web_data->RemoveTokenForService(ApplyAccountIdPrefix(account_id));
   }
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::RevokeCredentialsOnServer(
     const std::string& refresh_token) {
   // Keep track or all server revoke requests.  This way they can be deleted
   // before the token service is shutdown and won't outlive the profile.
-  server_revokes_.push_back(new RevokeServerRefreshToken(this, refresh_token));
+  server_revokes_.push_back(
+      base::MakeUnique<RevokeServerRefreshToken>(this, refresh_token));
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::CancelWebTokenFetch() {
   if (web_data_service_request_ != 0) {
     scoped_refptr<TokenWebData> token_web_data = client_->GetDatabase();
     DCHECK(token_web_data.get());
     token_web_data->CancelRequest(web_data_service_request_);
     web_data_service_request_ = 0;
   }
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::Shutdown() {
   VLOG(1) << "MutablePO2TS::Shutdown";
   server_revokes_.clear();
   CancelWebTokenFetch();
   refresh_tokens_.clear();
 }
 
 void MutableProfileOAuth2TokenServiceDelegate::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   // If our network has changed, reset the backoff timer so that errors caused
   // by a previous lack of network connectivity don't prevent new requests.
   backoff_entry_.Reset();
 }
 
 const net::BackoffEntry*
     MutableProfileOAuth2TokenServiceDelegate::BackoffEntry() const {
   return &backoff_entry_;
 }