Index: chrome/browser/extensions/api/identity/gaia_web_auth_flow.h |
diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h |
index e00847b19aed4b980a37bf29317c3d4104d1deb3..7cb132a5c4e36ffc28f823d811c55074f1a55c60 100644 |
--- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h |
+++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h |
@@ -81,7 +81,7 @@ class GaiaWebAuthFlow : public UbertokenConsumer, public WebAuthFlow::Delegate { |
private: |
// Creates a WebAuthFlow, which will navigate to |url|. Can override |
// for testing. Used to kick off the MergeSession (step #2). |
- virtual scoped_ptr<WebAuthFlow> CreateWebAuthFlow(GURL url); |
+ virtual std::unique_ptr<WebAuthFlow> CreateWebAuthFlow(GURL url); |
Delegate* delegate_; |
Profile* profile_; |
@@ -89,8 +89,8 @@ class GaiaWebAuthFlow : public UbertokenConsumer, public WebAuthFlow::Delegate { |
std::string redirect_scheme_; |
std::string redirect_path_prefix_; |
GURL auth_url_; |
- scoped_ptr<UbertokenFetcher> ubertoken_fetcher_; |
- scoped_ptr<WebAuthFlow> web_flow_; |
+ std::unique_ptr<UbertokenFetcher> ubertoken_fetcher_; |
+ std::unique_ptr<WebAuthFlow> web_flow_; |
DISALLOW_COPY_AND_ASSIGN(GaiaWebAuthFlow); |
}; |