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

chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc
similarity index 78%
rename from chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc
index 9211a50d32abc7efbcc07a135210ea3335041f27..90ae916303f7b4433f6f3708f6b32515d3a5480c 100644
--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_refresh_token_fetcher_unittest.cc
@@ -5,8 +5,8 @@
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
+#include "chrome/browser/supervised_user/supervised_user_refresh_token_fetcher.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ -26,11 +26,11 @@ namespace {
 
 const char kAccountId[] = "account_id";
 const char kDeviceName[] = "Compy";
-const char kManagedUserId[] = "abcdef";
+const char kSupervisedUserId[] = "abcdef";
 
 const char kAccessToken[] = "accesstoken";
 const char kAuthorizationCode[] = "authorizationcode";
-const char kManagedUserToken[] = "managedusertoken";
+const char kSupervisedUserToken[] = "supervisedusertoken";
 const char kOAuth2RefreshToken[] = "refreshtoken";
 
 const char kIssueTokenResponseFormat[] =
@@ -85,10 +85,10 @@ void VerifyTokenRequest(
 
 }  // namespace
 
-class ManagedUserRefreshTokenFetcherTest : public testing::Test {
+class SupervisedUserRefreshTokenFetcherTest : public testing::Test {
  public:
-  ManagedUserRefreshTokenFetcherTest();
-  virtual ~ManagedUserRefreshTokenFetcherTest() {}
+  SupervisedUserRefreshTokenFetcherTest();
+  virtual ~SupervisedUserRefreshTokenFetcherTest() {}
 
  protected:
   void StartFetching();
@@ -114,31 +114,33 @@ class ManagedUserRefreshTokenFetcherTest : public testing::Test {
   TestingProfile profile_;
   FakeProfileOAuth2TokenService oauth2_token_service_;
   net::TestURLFetcherFactory url_fetcher_factory_;
-  scoped_ptr<ManagedUserRefreshTokenFetcher> token_fetcher_;
+  scoped_ptr<SupervisedUserRefreshTokenFetcher> token_fetcher_;
 
   GoogleServiceAuthError error_;
   std::string token_;
-  base::WeakPtrFactory<ManagedUserRefreshTokenFetcherTest> weak_ptr_factory_;
+  base::WeakPtrFactory<SupervisedUserRefreshTokenFetcherTest> weak_ptr_factory_;
 };
 
-ManagedUserRefreshTokenFetcherTest::ManagedUserRefreshTokenFetcherTest()
-    : token_fetcher_(
-          ManagedUserRefreshTokenFetcher::Create(&oauth2_token_service_,
-                                                 kAccountId,
-                                                 profile_.GetRequestContext())),
+SupervisedUserRefreshTokenFetcherTest::SupervisedUserRefreshTokenFetcherTest()
+    : token_fetcher_(SupervisedUserRefreshTokenFetcher::Create(
+                         &oauth2_token_service_,
+                         kAccountId,
+                         profile_.GetRequestContext())),
       error_(GoogleServiceAuthError::NONE),
       weak_ptr_factory_(this) {}
 
-void ManagedUserRefreshTokenFetcherTest::StartFetching() {
+void SupervisedUserRefreshTokenFetcherTest::StartFetching() {
   oauth2_token_service_.IssueRefreshToken(kOAuth2RefreshToken);
-  token_fetcher_->Start(kManagedUserId, kDeviceName,
-                        base::Bind(
-                            &ManagedUserRefreshTokenFetcherTest::OnTokenFetched,
-                            weak_ptr_factory_.GetWeakPtr()));
+  token_fetcher_->Start(
+      kSupervisedUserId,
+      kDeviceName,
+      base::Bind(
+          &SupervisedUserRefreshTokenFetcherTest::OnTokenFetched,
+          weak_ptr_factory_.GetWeakPtr()));
 }
 
 net::TestURLFetcher*
-ManagedUserRefreshTokenFetcherTest::GetIssueTokenRequest() {
+SupervisedUserRefreshTokenFetcherTest::GetIssueTokenRequest() {
   net::TestURLFetcher* url_fetcher = url_fetcher_factory_.GetFetcherByID(1);
   if (!url_fetcher)
     return NULL;
@@ -151,9 +153,9 @@ ManagedUserRefreshTokenFetcherTest::GetIssueTokenRequest() {
   EXPECT_TRUE(headers.GetHeader("Authorization", &access_token));
   EXPECT_EQ(std::string("Bearer ") + kAccessToken, access_token);
   const std::string upload_data = url_fetcher->upload_data();
-  std::string managed_user_id;
-  EXPECT_TRUE(GetValueForKey(upload_data, "profile_id", &managed_user_id));
-  EXPECT_EQ(kManagedUserId, managed_user_id);
+  std::string supervised_user_id;
+  EXPECT_TRUE(GetValueForKey(upload_data, "profile_id", &supervised_user_id));
+  EXPECT_EQ(kSupervisedUserId, supervised_user_id);
   std::string device_name;
   EXPECT_TRUE(GetValueForKey(upload_data, "device_name", &device_name));
   EXPECT_EQ(kDeviceName, device_name);
@@ -161,7 +163,7 @@ ManagedUserRefreshTokenFetcherTest::GetIssueTokenRequest() {
 }
 
 net::TestURLFetcher*
-ManagedUserRefreshTokenFetcherTest::GetRefreshTokenRequest() {
+SupervisedUserRefreshTokenFetcherTest::GetRefreshTokenRequest() {
   net::TestURLFetcher* url_fetcher = url_fetcher_factory_.GetFetcherByID(
       gaia::GaiaOAuthClient::kUrlFetcherId);
   if (!url_fetcher)
@@ -176,7 +178,7 @@ ManagedUserRefreshTokenFetcherTest::GetRefreshTokenRequest() {
 }
 
 void
-ManagedUserRefreshTokenFetcherTest::MakeOAuth2TokenServiceRequestSucceed() {
+SupervisedUserRefreshTokenFetcherTest::MakeOAuth2TokenServiceRequestSucceed() {
   std::vector<FakeProfileOAuth2TokenService::PendingRequest> requests =
       oauth2_token_service_.GetPendingRequests();
   VerifyTokenRequest(requests);
@@ -188,7 +190,7 @@ ManagedUserRefreshTokenFetcherTest::MakeOAuth2TokenServiceRequestSucceed() {
 }
 
 void
-ManagedUserRefreshTokenFetcherTest::MakeOAuth2TokenServiceRequestFail(
+SupervisedUserRefreshTokenFetcherTest::MakeOAuth2TokenServiceRequestFail(
     GoogleServiceAuthError::State error) {
   std::vector<FakeProfileOAuth2TokenService::PendingRequest> requests =
       oauth2_token_service_.GetPendingRequests();
@@ -197,23 +199,23 @@ ManagedUserRefreshTokenFetcherTest::MakeOAuth2TokenServiceRequestFail(
                                            GoogleServiceAuthError(error));
 }
 
-void ManagedUserRefreshTokenFetcherTest::MakeIssueTokenRequestSucceed() {
+void SupervisedUserRefreshTokenFetcherTest::MakeIssueTokenRequestSucceed() {
   SendResponse(GetIssueTokenRequest(),
                base::StringPrintf(kIssueTokenResponseFormat,
                                   kAuthorizationCode));
 }
 
-void ManagedUserRefreshTokenFetcherTest::MakeRefreshTokenFetchSucceed() {
+void SupervisedUserRefreshTokenFetcherTest::MakeRefreshTokenFetchSucceed() {
   SendResponse(GetRefreshTokenRequest(),
                base::StringPrintf(kGetRefreshTokenResponseFormat,
-                                  kManagedUserToken));
+                                  kSupervisedUserToken));
 }
 
-void ManagedUserRefreshTokenFetcherTest::Reset() {
+void SupervisedUserRefreshTokenFetcherTest::Reset() {
   token_fetcher_.reset();
 }
 
-void ManagedUserRefreshTokenFetcherTest::OnTokenFetched(
+void SupervisedUserRefreshTokenFetcherTest::OnTokenFetched(
     const GoogleServiceAuthError& error,
     const std::string& token) {
   error_ = error;
@@ -222,17 +224,17 @@ void ManagedUserRefreshTokenFetcherTest::OnTokenFetched(
 
 // Tests --------------------------------------------------------
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, Success) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, Success) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   MakeIssueTokenRequestSucceed();
   MakeRefreshTokenFetchSucceed();
 
   EXPECT_EQ(GoogleServiceAuthError::NONE, error().state());
-  EXPECT_EQ(kManagedUserToken, token());
+  EXPECT_EQ(kSupervisedUserToken, token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, ExpiredAccessToken) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, ExpiredAccessToken) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   SetHttpError(GetIssueTokenRequest(), net::HTTP_UNAUTHORIZED);
@@ -241,10 +243,10 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, ExpiredAccessToken) {
   MakeRefreshTokenFetchSucceed();
 
   EXPECT_EQ(GoogleServiceAuthError::NONE, error().state());
-  EXPECT_EQ(kManagedUserToken, token());
+  EXPECT_EQ(kSupervisedUserToken, token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, ExpiredAccessTokenRetry) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, ExpiredAccessTokenRetry) {
   // If we get a 401 error for the second time, we should give up instead of
   // retrying again.
   StartFetching();
@@ -258,7 +260,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, ExpiredAccessTokenRetry) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, MalformedIssueTokenResponse) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, MalformedIssueTokenResponse) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   SendResponse(GetIssueTokenRequest(), "choke");
@@ -268,7 +270,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, MalformedIssueTokenResponse) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, FetchAccessTokenFailure) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, FetchAccessTokenFailure) {
   StartFetching();
   MakeOAuth2TokenServiceRequestFail(
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
@@ -277,7 +279,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, FetchAccessTokenFailure) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, IssueTokenNetworkError) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, IssueTokenNetworkError) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   SetNetworkError(GetIssueTokenRequest(), net::ERR_SSL_PROTOCOL_ERROR);
@@ -287,7 +289,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, IssueTokenNetworkError) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, FetchRefreshTokenNetworkError) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, FetchRefreshTokenNetworkError) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   MakeIssueTokenRequestSucceed();
@@ -300,7 +302,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, FetchRefreshTokenNetworkError) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest,
+TEST_F(SupervisedUserRefreshTokenFetcherTest,
        FetchRefreshTokenTransientNetworkError) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
@@ -311,10 +313,10 @@ TEST_F(ManagedUserRefreshTokenFetcherTest,
   MakeRefreshTokenFetchSucceed();
 
   EXPECT_EQ(GoogleServiceAuthError::NONE, error().state());
-  EXPECT_EQ(kManagedUserToken, token());
+  EXPECT_EQ(kSupervisedUserToken, token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, FetchRefreshTokenBadRequest) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, FetchRefreshTokenBadRequest) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   MakeIssueTokenRequestSucceed();
@@ -325,7 +327,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, FetchRefreshTokenBadRequest) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, CancelWhileFetchingAccessToken) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, CancelWhileFetchingAccessToken) {
   StartFetching();
   Reset();
 
@@ -333,7 +335,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, CancelWhileFetchingAccessToken) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, CancelWhileCallingIssueToken) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, CancelWhileCallingIssueToken) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   Reset();
@@ -342,7 +344,7 @@ TEST_F(ManagedUserRefreshTokenFetcherTest, CancelWhileCallingIssueToken) {
   EXPECT_EQ(std::string(), token());
 }
 
-TEST_F(ManagedUserRefreshTokenFetcherTest, CancelWhileFetchingRefreshToken) {
+TEST_F(SupervisedUserRefreshTokenFetcherTest, CancelWhileFetchingRefreshToken) {
   StartFetching();
   MakeOAuth2TokenServiceRequestSucceed();
   MakeIssueTokenRequestSucceed();