Rename "managed (mode|user)" to "supervised user" (part 2)

chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc

Index: chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
similarity index 79%
rename from chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc
rename to chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
index 4c25d874edd4c574a3caed8ad1e4c165bae2521d..a58c64b54c5a806be14235be0ed1b87de15fc683 100644
--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher.cc
+++ b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h"
+#include "chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.h"
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
@@ -45,19 +45,20 @@ static const char kAuthorizationHeaderFormat[] =
 
 static const char kCodeKey[] = "code";
 
-class ManagedUserRefreshTokenFetcherImpl
-    : public ManagedUserRefreshTokenFetcher,
+class SupervisedUserRefreshTokenFetcherImpl
+    : public SupervisedUserRefreshTokenFetcher,
       public OAuth2TokenService::Consumer,
       public URLFetcherDelegate,
       public GaiaOAuthClient::Delegate {
  public:
-  ManagedUserRefreshTokenFetcherImpl(OAuth2TokenService* oauth2_token_service,
-                                     const std::string& account_id,
-                                     URLRequestContextGetter* context);
-  virtual ~ManagedUserRefreshTokenFetcherImpl();
-
-  // ManagedUserRefreshTokenFetcher implementation:
-  virtual void Start(const std::string& managed_user_id,
+  SupervisedUserRefreshTokenFetcherImpl(
+      OAuth2TokenService* oauth2_token_service,
+      const std::string& account_id,
+      URLRequestContextGetter* context);
+  virtual ~SupervisedUserRefreshTokenFetcherImpl();
+
+  // SupervisedUserRefreshTokenFetcher implementation:
+  virtual void Start(const std::string& supervised_user_id,
                      const std::string& device_name,
                      const TokenCallback& callback) OVERRIDE;
 
@@ -94,7 +95,7 @@ class ManagedUserRefreshTokenFetcherImpl
   URLRequestContextGetter* context_;
 
   std::string device_name_;
-  std::string managed_user_id_;
+  std::string supervised_user_id_;
   TokenCallback callback_;
 
   scoped_ptr<OAuth2TokenService::Request> access_token_request_;
@@ -104,37 +105,38 @@ class ManagedUserRefreshTokenFetcherImpl
   scoped_ptr<GaiaOAuthClient> gaia_oauth_client_;
 };
 
-ManagedUserRefreshTokenFetcherImpl::ManagedUserRefreshTokenFetcherImpl(
+SupervisedUserRefreshTokenFetcherImpl::SupervisedUserRefreshTokenFetcherImpl(
     OAuth2TokenService* oauth2_token_service,
     const std::string& account_id,
     URLRequestContextGetter* context)
-    : OAuth2TokenService::Consumer("managed_user"),
+    : OAuth2TokenService::Consumer("supervised_user"),
       oauth2_token_service_(oauth2_token_service),
       account_id_(account_id),
       context_(context),
       access_token_expired_(false) {}
 
-ManagedUserRefreshTokenFetcherImpl::~ManagedUserRefreshTokenFetcherImpl() {}
+SupervisedUserRefreshTokenFetcherImpl::
+~SupervisedUserRefreshTokenFetcherImpl() {}
 
-void ManagedUserRefreshTokenFetcherImpl::Start(
-    const std::string& managed_user_id,
+void SupervisedUserRefreshTokenFetcherImpl::Start(
+    const std::string& supervised_user_id,
     const std::string& device_name,
     const TokenCallback& callback) {
   DCHECK(callback_.is_null());
-  managed_user_id_ = managed_user_id;
+  supervised_user_id_ = supervised_user_id;
   device_name_ = device_name;
   callback_ = callback;
   StartFetching();
 }
 
-void ManagedUserRefreshTokenFetcherImpl::StartFetching() {
+void SupervisedUserRefreshTokenFetcherImpl::StartFetching() {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kOAuth1LoginScope);
   access_token_request_ = oauth2_token_service_->StartRequest(
       account_id_, scopes, this);
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnGetTokenSuccess(
+void SupervisedUserRefreshTokenFetcherImpl::OnGetTokenSuccess(
     const OAuth2TokenService::Request* request,
     const std::string& access_token,
     const Time& expiration_time) {
@@ -160,14 +162,14 @@ void ManagedUserRefreshTokenFetcherImpl::OnGetTokenSuccess(
       net::EscapeUrlEncodedData(
           GaiaUrls::GetInstance()->oauth2_chrome_client_id(), true).c_str(),
       net::EscapeUrlEncodedData(kChromeSyncSupervisedOAuth2Scope, true).c_str(),
-      net::EscapeUrlEncodedData(managed_user_id_, true).c_str(),
+      net::EscapeUrlEncodedData(supervised_user_id_, true).c_str(),
       net::EscapeUrlEncodedData(device_name_, true).c_str());
   url_fetcher_->SetUploadData("application/x-www-form-urlencoded", body);
 
   url_fetcher_->Start();
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnGetTokenFailure(
+void SupervisedUserRefreshTokenFetcherImpl::OnGetTokenFailure(
     const OAuth2TokenService::Request* request,
     const GoogleServiceAuthError& error) {
   DCHECK_EQ(access_token_request_.get(), request);
@@ -175,7 +177,7 @@ void ManagedUserRefreshTokenFetcherImpl::OnGetTokenFailure(
   callback_.Reset();
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnURLFetchComplete(
+void SupervisedUserRefreshTokenFetcherImpl::OnURLFetchComplete(
     const URLFetcher* source) {
   const net::URLRequestStatus& status = source->GetStatus();
   if (!status.is_success()) {
@@ -225,7 +227,7 @@ void ManagedUserRefreshTokenFetcherImpl::OnURLFetchComplete(
                                             this);
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnGetTokensResponse(
+void SupervisedUserRefreshTokenFetcherImpl::OnGetTokensResponse(
     const std::string& refresh_token,
     const std::string& access_token,
     int expires_in_seconds) {
@@ -235,19 +237,19 @@ void ManagedUserRefreshTokenFetcherImpl::OnGetTokensResponse(
                                  refresh_token);
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnRefreshTokenResponse(
+void SupervisedUserRefreshTokenFetcherImpl::OnRefreshTokenResponse(
     const std::string& access_token,
     int expires_in_seconds) {
   NOTREACHED();
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnOAuthError() {
+void SupervisedUserRefreshTokenFetcherImpl::OnOAuthError() {
   DispatchGoogleServiceAuthError(
       GoogleServiceAuthError(GoogleServiceAuthError::CONNECTION_FAILED),
       std::string());
 }
 
-void ManagedUserRefreshTokenFetcherImpl::OnNetworkError(int response_code) {
+void SupervisedUserRefreshTokenFetcherImpl::OnNetworkError(int response_code) {
   // TODO(bauerb): We should return the HTTP response code somehow.
   DLOG(WARNING) << "HTTP error " << response_code;
   DispatchGoogleServiceAuthError(
@@ -255,12 +257,13 @@ void ManagedUserRefreshTokenFetcherImpl::OnNetworkError(int response_code) {
       std::string());
 }
 
-void ManagedUserRefreshTokenFetcherImpl::DispatchNetworkError(int error_code) {
+void SupervisedUserRefreshTokenFetcherImpl::DispatchNetworkError(
+    int error_code) {
   DispatchGoogleServiceAuthError(
       GoogleServiceAuthError::FromConnectionError(error_code), std::string());
 }
 
-void ManagedUserRefreshTokenFetcherImpl::DispatchGoogleServiceAuthError(
+void SupervisedUserRefreshTokenFetcherImpl::DispatchGoogleServiceAuthError(
     const GoogleServiceAuthError& error,
     const std::string& token) {
   callback_.Run(error, token);
@@ -270,14 +273,16 @@ void ManagedUserRefreshTokenFetcherImpl::DispatchGoogleServiceAuthError(
 }  // namespace
 
 // static
-scoped_ptr<ManagedUserRefreshTokenFetcher>
-ManagedUserRefreshTokenFetcher::Create(OAuth2TokenService* oauth2_token_service,
-                                       const std::string& account_id,
-                                       URLRequestContextGetter* context) {
-  scoped_ptr<ManagedUserRefreshTokenFetcher> fetcher(
-      new ManagedUserRefreshTokenFetcherImpl(oauth2_token_service, account_id,
-          context));
+scoped_ptr<SupervisedUserRefreshTokenFetcher>
+SupervisedUserRefreshTokenFetcher::Create(
+    OAuth2TokenService* oauth2_token_service,
+    const std::string& account_id,
+    URLRequestContextGetter* context) {
+  scoped_ptr<SupervisedUserRefreshTokenFetcher> fetcher(
+      new SupervisedUserRefreshTokenFetcherImpl(oauth2_token_service,
+                                                account_id,
+                                                context));
   return fetcher.Pass();
 }
 
-ManagedUserRefreshTokenFetcher::~ManagedUserRefreshTokenFetcher() {}
+SupervisedUserRefreshTokenFetcher::~SupervisedUserRefreshTokenFetcher() {}