| Index: chrome/browser/chromeos/login/online_attempt_unittest.cc
|
| diff --git a/chrome/browser/chromeos/login/online_attempt_unittest.cc b/chrome/browser/chromeos/login/online_attempt_unittest.cc
|
| index 1222e25b5e47ffdc5474f2ab958a69bfd94d8b91..04e1b936608cc3f0c8ab11cfed3c064736779c6d 100644
|
| --- a/chrome/browser/chromeos/login/online_attempt_unittest.cc
|
| +++ b/chrome/browser/chromeos/login/online_attempt_unittest.cc
|
| @@ -132,7 +132,6 @@ TEST_F(OnlineAttemptTest, LoginCancelRetry) {
|
| // This factory creates fake URLFetchers that Start() a fake fetch attempt
|
| // and then come back on the IO thread saying they've been canceled.
|
| MockFactory<GotCanceledFetcher> factory;
|
| - URLFetcher::set_factory(&factory);
|
|
|
| attempt_->Initiate(&profile);
|
| BrowserThread::PostTask(
|
| @@ -144,7 +143,6 @@ TEST_F(OnlineAttemptTest, LoginCancelRetry) {
|
| EXPECT_TRUE(error == state_.online_outcome().error());
|
| EXPECT_EQ(LoginFailure::NETWORK_AUTH_FAILED,
|
| state_.online_outcome().reason());
|
| - URLFetcher::set_factory(NULL);
|
| }
|
|
|
| TEST_F(OnlineAttemptTest, LoginTimeout) {
|
| @@ -159,7 +157,6 @@ TEST_F(OnlineAttemptTest, LoginTimeout) {
|
| // This factory creates fake URLFetchers that Start() a fake fetch attempt
|
| // and then come back on the IO thread saying they've been canceled.
|
| MockFactory<ExpectCanceledFetcher> factory;
|
| - URLFetcher::set_factory(&factory);
|
|
|
| attempt_->Initiate(&profile);
|
| BrowserThread::PostTask(
|
| @@ -172,7 +169,6 @@ TEST_F(OnlineAttemptTest, LoginTimeout) {
|
| MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(LoginFailure::LOGIN_TIMED_OUT, state_.online_outcome().reason());
|
| - URLFetcher::set_factory(NULL);
|
| }
|
|
|
| TEST_F(OnlineAttemptTest, HostedLoginRejected) {
|
| @@ -188,7 +184,6 @@ TEST_F(OnlineAttemptTest, HostedLoginRejected) {
|
|
|
| // This is how we inject fake URLFetcher objects, with a factory.
|
| MockFactory<HostedFetcher> factory;
|
| - URLFetcher::set_factory(&factory);
|
|
|
| TestAttemptState local_state("", "", "", "", "", true);
|
| attempt_ = new OnlineAttempt(&local_state, resolver_.get());
|
| @@ -202,7 +197,6 @@ TEST_F(OnlineAttemptTest, HostedLoginRejected) {
|
| EXPECT_EQ(error, local_state.online_outcome());
|
| EXPECT_EQ(LoginFailure::NETWORK_AUTH_FAILED,
|
| local_state.online_outcome().reason());
|
| - URLFetcher::set_factory(NULL);
|
| }
|
|
|
| TEST_F(OnlineAttemptTest, FullLogin) {
|
| @@ -214,7 +208,6 @@ TEST_F(OnlineAttemptTest, FullLogin) {
|
|
|
| // This is how we inject fake URLFetcher objects, with a factory.
|
| MockFactory<SuccessFetcher> factory;
|
| - URLFetcher::set_factory(&factory);
|
|
|
| TestAttemptState local_state("", "", "", "", "", true);
|
| attempt_ = new OnlineAttempt(&local_state, resolver_.get());
|
| @@ -226,7 +219,6 @@ TEST_F(OnlineAttemptTest, FullLogin) {
|
| MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(LoginFailure::None(), local_state.online_outcome());
|
| - URLFetcher::set_factory(NULL);
|
| }
|
|
|
| TEST_F(OnlineAttemptTest, LoginNetFailure) {
|
|
|