Refactor CryptAuth component to be more testable.

components/proximity_auth/cryptauth/cryptauth_access_token_fetcher_unittest.cc

Index: components/proximity_auth/cryptauth/cryptauth_access_token_fetcher_unittest.cc
diff --git a/components/proximity_auth/cryptauth/cryptauth_account_token_fetcher_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_access_token_fetcher_unittest.cc
similarity index 62%
rename from components/proximity_auth/cryptauth/cryptauth_account_token_fetcher_unittest.cc
rename to components/proximity_auth/cryptauth/cryptauth_access_token_fetcher_unittest.cc
index 74fb5a352a66e5dc9dedfd59eb100c901fc71527..05e6335afdf1dc4e0fb85b97ad5787be608439d9 100644
--- a/components/proximity_auth/cryptauth/cryptauth_account_token_fetcher_unittest.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_access_token_fetcher_unittest.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/proximity_auth/cryptauth/cryptauth_account_token_fetcher.h"
-
 #include <string>
 
 #include "base/bind.h"
+#include "components/proximity_auth/cryptauth/cryptauth_access_token_fetcher_impl.h"

[Ilya Sherman, 2015/04/06 23:48:02]

nit: The tested header file is supposed to be at the top of unittest files.

[Tim Song, 2015/04/07 02:22:57]

Done.

 #include "google_apis/gaia/fake_oauth2_token_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -25,31 +24,32 @@ void SaveAccessToken(std::string* out_token, const std::string& in_token) {
 
 }  // namespace
 
-class ProximityAuthCryptAuthAccountTokenFetcherTest : public testing::Test {
+class ProximityAuthCryptAuthAccessTokenFetcherTest : public testing::Test {
  protected:
-  ProximityAuthCryptAuthAccountTokenFetcherTest()
-      : fetcher_(&token_service_, kAccountId) {
+  ProximityAuthCryptAuthAccessTokenFetcherTest()
+      : fetcher_(
+            new CryptAuthAccessTokenFetcherImpl(&token_service_, kAccountId)) {
     token_service_.AddAccount(kAccountId);
   }
 
   FakeOAuth2TokenService token_service_;
-  CryptAuthAccountTokenFetcher fetcher_;
+  scoped_ptr<CryptAuthAccessTokenFetcher> fetcher_;

[Ilya Sherman, 2015/04/06 23:48:02]

nit: Does this need to be a scoped_ptr, or can we revert this change?

[Tim Song, 2015/04/07 02:22:57]

Done.

 
-  DISALLOW_COPY_AND_ASSIGN(ProximityAuthCryptAuthAccountTokenFetcherTest);
+  DISALLOW_COPY_AND_ASSIGN(ProximityAuthCryptAuthAccessTokenFetcherTest);
 };
 
-TEST_F(ProximityAuthCryptAuthAccountTokenFetcherTest, FetchSuccess) {
+TEST_F(ProximityAuthCryptAuthAccessTokenFetcherTest, FetchSuccess) {
   std::string result;
-  fetcher_.FetchAccessToken(base::Bind(SaveAccessToken, &result));
+  fetcher_->FetchAccessToken(base::Bind(SaveAccessToken, &result));
   token_service_.IssueAllTokensForAccount(kAccountId, kAccessToken,
                                           base::Time::Max());
 
   EXPECT_EQ(kAccessToken, result);
 }
 
-TEST_F(ProximityAuthCryptAuthAccountTokenFetcherTest, FetchFailure) {
+TEST_F(ProximityAuthCryptAuthAccessTokenFetcherTest, FetchFailure) {
   std::string result(kInvalidResult);
-  fetcher_.FetchAccessToken(base::Bind(SaveAccessToken, &result));
+  fetcher_->FetchAccessToken(base::Bind(SaveAccessToken, &result));
   token_service_.IssueErrorForAllPendingRequestsForAccount(
       kAccountId,
       GoogleServiceAuthError(GoogleServiceAuthError::SERVICE_ERROR));
@@ -57,13 +57,13 @@ TEST_F(ProximityAuthCryptAuthAccountTokenFetcherTest, FetchFailure) {
   EXPECT_EQ(std::string(), result);
 }
 
-TEST_F(ProximityAuthCryptAuthAccountTokenFetcherTest, FetcherReuse) {
+TEST_F(ProximityAuthCryptAuthAccessTokenFetcherTest, FetcherReuse) {
   std::string result1;
-  fetcher_.FetchAccessToken(base::Bind(SaveAccessToken, &result1));
+  fetcher_->FetchAccessToken(base::Bind(SaveAccessToken, &result1));
 
   {
     std::string result2(kInvalidResult);
-    fetcher_.FetchAccessToken(base::Bind(SaveAccessToken, &result2));
+    fetcher_->FetchAccessToken(base::Bind(SaveAccessToken, &result2));
     EXPECT_EQ(std::string(), result2);
   }