| Index: components/signin/core/browser/about_signin_internals.h
|
| diff --git a/components/signin/core/browser/about_signin_internals.h b/components/signin/core/browser/about_signin_internals.h
|
| index 7af382bfc8e4b8cfc574c758fb3ed46611751faf..0e32b0eb345f91331ce9087e61612a6172a903c0 100644
|
| --- a/components/signin/core/browser/about_signin_internals.h
|
| +++ b/components/signin/core/browser/about_signin_internals.h
|
| @@ -32,7 +32,7 @@ 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.
|
| @@ -110,7 +110,8 @@ class AboutSigninInternals
|
| ~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();
|
| @@ -124,15 +125,15 @@ class AboutSigninInternals
|
| 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();
|
|
|