| Index: chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
|
| diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
|
| index b904a03cc247a56450c6d18a7f5a489a5bbd2c8b..a2e61c0510acd52fe2d0b5d453b1fb7894622e07 100644
|
| --- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
|
| +++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
|
| @@ -5,12 +5,12 @@
|
| #ifndef CHROME_BROWSER_SUPERVISED_USER_CHILD_ACCOUNTS_FAMILY_INFO_FETCHER_H_
|
| #define CHROME_BROWSER_SUPERVISED_USER_CHILD_ACCOUNTS_FAMILY_INFO_FETCHER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "google_apis/gaia/oauth2_token_service.h"
|
| #include "net/url_request/url_fetcher.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| @@ -121,10 +121,10 @@ class FamilyInfoFetcher : public OAuth2TokenService::Observer,
|
|
|
| std::string request_suffix_;
|
| net::URLFetcher::RequestType request_type_;
|
| - scoped_ptr<OAuth2TokenService::Request> access_token_request_;
|
| + std::unique_ptr<OAuth2TokenService::Request> access_token_request_;
|
| std::string access_token_;
|
| bool access_token_expired_;
|
| - scoped_ptr<net::URLFetcher> url_fetcher_;
|
| + std::unique_ptr<net::URLFetcher> url_fetcher_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FamilyInfoFetcher);
|
| };
|
|
|