Eliminate usage of PO2TS::GetPrimaryAccountID() in UbertokenFetcher.

chrome/browser/signin/ubertoken_fetcher_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/ubertoken_fetcher.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_signin_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestAccountId[] = "test@gmail.com";
 
@@ skipping 40 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     fetcher_.reset();
   }
 
   TestingProfile* profile() { return profile_.get(); }
 
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;

[Roger Tawa OOO till Jul 10th, 2014/01/10 00:08:14]

It would be good to get rid of Profile here.  Its needed for
FakeProfileOAuth2TokenService though.

We should have a FakeOAuth2TokenService that lives in google_apis\gaia, that has
a set of IssueXXX methods just like FakeProfileOAuth2TokenService.  Then these
tests don't need to live in //chrome.  Since Mihai is refactoring those classes,
maybe coordinate with him.  I'd be OK though with committing as is, and having
that cleanup done as part of Mihai's refactor.

[blundell, 2014/01/10 09:02:03]

Mihai and I discussed this earlier yesterday and came up with with the same plan
that you suggest. I am going to make those changes as part of moving this class
into google_apis.

On 2014/01/10 00:08:14, Roger Tawa wrote:

   net::TestURLFetcherFactory factory_;
   MockUbertokenConsumer consumer_;
   scoped_ptr<UbertokenFetcher> fetcher_;
 };
 
 TEST_F(UbertokenFetcherTest, Basic) {
 }
 
 TEST_F(UbertokenFetcherTest, Success) {
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile())->
       UpdateCredentials(kTestAccountId, "refreshToken");
-  fetcher_->StartFetchingToken();
+  fetcher_->StartFetchingToken(kTestAccountId);
   fetcher_->OnGetTokenSuccess(NULL, "accessToken", base::Time());
   fetcher_->OnUberAuthTokenSuccess("uberToken");
   EXPECT_EQ(0, consumer_.nb_error_);
   EXPECT_EQ(1, consumer_.nb_correct_token_);
   EXPECT_EQ("uberToken", consumer_.last_token_);
 }
 
 TEST_F(UbertokenFetcherTest, NoRefreshToken) {
-  fetcher_->StartFetchingToken();
+  fetcher_->StartFetchingToken(kTestAccountId);
   GoogleServiceAuthError error(GoogleServiceAuthError::USER_NOT_SIGNED_UP);
   fetcher_->OnGetTokenFailure(NULL, error);
   EXPECT_EQ(1, consumer_.nb_error_);
   EXPECT_EQ(0, consumer_.nb_correct_token_);
 }
 
 TEST_F(UbertokenFetcherTest, FailureToGetAccessToken) {
   GoogleServiceAuthError error(GoogleServiceAuthError::USER_NOT_SIGNED_UP);
 
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile())->
       UpdateCredentials(kTestAccountId, "refreshToken");
-  fetcher_->StartFetchingToken();
+  fetcher_->StartFetchingToken(kTestAccountId);
   fetcher_->OnGetTokenFailure(NULL, error);
 
   EXPECT_EQ(1, consumer_.nb_error_);
   EXPECT_EQ(0, consumer_.nb_correct_token_);
   EXPECT_EQ("", consumer_.last_token_);
 }
 
 TEST_F(UbertokenFetcherTest, FailureToGetUberToken) {
   GoogleServiceAuthError error(GoogleServiceAuthError::USER_NOT_SIGNED_UP);
 
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile())->
       UpdateCredentials(kTestAccountId, "refreshToken");
-  fetcher_->StartFetchingToken();
+  fetcher_->StartFetchingToken(kTestAccountId);
   fetcher_->OnGetTokenSuccess(NULL, "accessToken", base::Time());
   fetcher_->OnUberAuthTokenFailure(error);
 
   EXPECT_EQ(1, consumer_.nb_error_);
   EXPECT_EQ(0, consumer_.nb_correct_token_);
   EXPECT_EQ("", consumer_.last_token_);
 }