Remove stl_util's deletion function use from components/signin/.

components/signin/core/browser/about_signin_internals.h

 // Copyright (c) 2012 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.
 
 #ifndef COMPONENTS_SIGNIN_CORE_BROWSER_ABOUT_SIGNIN_INTERNALS_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_ABOUT_SIGNIN_INTERNALS_H_
 
 #include <map>
 #include <memory>
 #include <string>
@@ skipping 14 matching lines @@
 class PrefRegistrySyncable;
 }
 
 class AccountTrackerService;
 class GaiaAuthFetcher;
 class ProfileOAuth2TokenService;
 class SigninClient;
 
 // Many values in SigninStatus are also associated with a timestamp.
 // This makes it easier to keep values and their associated times together.
-typedef std::pair<std::string, std::string> TimedSigninStatusValue;
+using TimedSigninStatusValue = std::pair<std::string, std::string>;
 
 // This class collects authentication, signin and token information
 // to propagate to about:signin-internals via SigninInternalsUI.
 class AboutSigninInternals
     : public KeyedService,
       public signin_internals_util::SigninDiagnosticsObserver,
       public OAuth2TokenService::DiagnosticsObserver,
       public GaiaCookieManagerService::Observer,
       SigninManagerBase::Observer,
       SigninErrorController::Observer {
@@ skipping 57 matching lines @@
       const GoogleServiceAuthError& error) override;
 
  private:
   // Encapsulates diagnostic information about tokens for different services.
   struct TokenInfo {
     TokenInfo(const std::string& consumer_id,
               const OAuth2TokenService::ScopeSet& scopes);
     ~TokenInfo();
     std::unique_ptr<base::DictionaryValue> ToValue() const;
 
-    static bool LessThan(const TokenInfo* a, const TokenInfo* b);
+    static bool LessThan(const std::unique_ptr<TokenInfo>& a,
+                         const std::unique_ptr<TokenInfo>& b);
 
     // Called when the token is invalidated.
     void Invalidate();
 
     std::string consumer_id;              // service that requested the token.
     OAuth2TokenService::ScopeSet scopes;  // Scoped that are requested.
     base::Time request_time;
     base::Time receive_time;
     base::Time expiration_time;
     GoogleServiceAuthError error;
     bool removed_;
   };
 
-  // Map account id to tokens associated to the account.
-  typedef std::map<std::string, std::vector<TokenInfo*> > TokenInfoMap;
-
   // Encapsulates both authentication and token related information. Used
   // by SigninInternals to maintain information that needs to be shown in
   // the about:signin-internals page.
   struct SigninStatus {
     std::vector<TimedSigninStatusValue> timed_signin_fields;
-    TokenInfoMap token_info_map;
+
+    // Map account id to tokens associated to the account.
+    std::map<std::string, std::vector<std::unique_ptr<TokenInfo>>>
+        token_info_map;
 
     SigninStatus();
     ~SigninStatus();
 
     TokenInfo* FindToken(const std::string& account_id,
                          const std::string& consumer_id,
                          const OAuth2TokenService::ScopeSet& scopes);
 
     // Returns a dictionary with the following form:
     // { "signin_info" :
@@ skipping 73 matching lines @@
   // Encapsulates the actual signin and token related values.
   // Most of the values are mirrored in the prefs for persistence.
   SigninStatus signin_status_;
 
   base::ObserverList<Observer> signin_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(AboutSigninInternals);
 };
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_ABOUT_SIGNIN_INTERNALS_H_