net: Remove typedef net::URLRequestStatus URLRequestStatus;

chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
 // A complete set of unit tests for GaiaAuthFetcher.
 // Originally ported from GoogleAuthenticator tests.
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 96 matching lines @@
 
   EXPECT_FALSE(expected_error == matching_error);
 
   matching_error = GoogleServiceAuthError(GoogleServiceAuthError::NONE);
 
   EXPECT_TRUE(expected_error == matching_error);
 }
 
 TEST_F(GaiaAuthFetcherTest, LoginNetFailure) {
   int error_no = net::ERR_CONNECTION_RESET;
-  URLRequestStatus status(URLRequestStatus::FAILED, error_no);
+  net::URLRequestStatus status(net::URLRequestStatus::FAILED, error_no);
 
   GoogleServiceAuthError expected_error =
       GoogleServiceAuthError::FromConnectionError(error_no);
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientLoginFailure(expected_error))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
 
   auth.OnURLFetchComplete(NULL,
                           client_login_source_,
                           status,
                           0,
                           cookies_,
                           std::string());
 }
 
 TEST_F(GaiaAuthFetcherTest, TokenNetFailure) {
   int error_no = net::ERR_CONNECTION_RESET;
-  URLRequestStatus status(URLRequestStatus::FAILED, error_no);
+  net::URLRequestStatus status(net::URLRequestStatus::FAILED, error_no);
 
   GoogleServiceAuthError expected_error =
       GoogleServiceAuthError::FromConnectionError(error_no);
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenFailure(_, expected_error))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
 
   auth.OnURLFetchComplete(NULL,
                           issue_auth_token_source_,
                           status,
                           0,
                           cookies_,
                           std::string());
 }
 
 
 TEST_F(GaiaAuthFetcherTest, LoginDenied) {
   std::string data("Error=BadAuthentication");
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
 
   GoogleServiceAuthError expected_error(
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientLoginFailure(expected_error))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
@@ skipping 39 matching lines @@
   result.sid = "sid";
   result.token = "auth";
   result.data = data;
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientLoginSuccess(result))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   auth.OnURLFetchComplete(NULL,
                           client_login_source_,
                           status,
                           RC_REQUEST_OK,
                           cookies_,
                           data);
 }
 
 TEST_F(GaiaAuthFetcherTest, WorkingIssueAuthToken) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenSuccess(_, "token"))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   auth.OnURLFetchComplete(NULL,
                           issue_auth_token_source_,
                           status,
                           RC_REQUEST_OK,
                           cookies_,
                           "token");
 }
 
 TEST_F(GaiaAuthFetcherTest, CheckTwoFactorResponse) {
   std::string response =
@@ skipping 13 matching lines @@
 
   GoogleServiceAuthError error =
       GoogleServiceAuthError(GoogleServiceAuthError::TWO_FACTOR);
 
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientLoginFailure(error))
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   auth.OnURLFetchComplete(NULL,
                           client_login_source_,
                           status,
                           RC_FORBIDDEN,
                           cookies_,
                           response);
 }
 
 TEST_F(GaiaAuthFetcherTest, CaptchaParse) {
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   std::string data = "Url=http://www.google.com/login/captcha\n"
                      "Error=CaptchaRequired\n"
                      "CaptchaToken=CCTOKEN\n"
                      "CaptchaUrl=Captcha?ctoken=CCTOKEN\n";
   GoogleServiceAuthError error =
       GaiaAuthFetcher::GenerateAuthError(data, status);
 
   std::string token = "CCTOKEN";
   GURL image_url("http://www.google.com/accounts/Captcha?ctoken=CCTOKEN");
   GURL unlock_url("http://www.google.com/login/captcha");
 
   EXPECT_EQ(error.state(), GoogleServiceAuthError::CAPTCHA_REQUIRED);
   EXPECT_EQ(error.captcha().token, token);
   EXPECT_EQ(error.captcha().image_url, image_url);
   EXPECT_EQ(error.captcha().unlock_url, unlock_url);
 }
 
 TEST_F(GaiaAuthFetcherTest, AccountDeletedError) {
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   std::string data = "Error=AccountDeleted\n";
   GoogleServiceAuthError error =
       GaiaAuthFetcher::GenerateAuthError(data, status);
   EXPECT_EQ(error.state(), GoogleServiceAuthError::ACCOUNT_DELETED);
 }
 
 TEST_F(GaiaAuthFetcherTest, AccountDisabledError) {
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   std::string data = "Error=AccountDisabled\n";
   GoogleServiceAuthError error =
       GaiaAuthFetcher::GenerateAuthError(data, status);
   EXPECT_EQ(error.state(), GoogleServiceAuthError::ACCOUNT_DISABLED);
 }
 
 TEST_F(GaiaAuthFetcherTest,BadAuthenticationError) {
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   std::string data = "Error=BadAuthentication\n";
   GoogleServiceAuthError error =
       GaiaAuthFetcher::GenerateAuthError(data, status);
   EXPECT_EQ(error.state(), GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
 }
 
 TEST_F(GaiaAuthFetcherTest,IncomprehensibleError) {
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   std::string data = "Error=Gobbledygook\n";
   GoogleServiceAuthError error =
       GaiaAuthFetcher::GenerateAuthError(data, status);
   EXPECT_EQ(error.state(), GoogleServiceAuthError::SERVICE_UNAVAILABLE);
 }
 
 TEST_F(GaiaAuthFetcherTest,ServiceUnavailableError) {
-  URLRequestStatus status(URLRequestStatus::SUCCESS, 0);
+  net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   std::string data = "Error=ServiceUnavailable\n";
   GoogleServiceAuthError error =
       GaiaAuthFetcher::GenerateAuthError(data, status);
   EXPECT_EQ(error.state(), GoogleServiceAuthError::SERVICE_UNAVAILABLE);
 }
 
 TEST_F(GaiaAuthFetcherTest, FullLogin) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnClientLoginSuccess(_))
       .Times(1);
@@ skipping 51 matching lines @@
       profile_.GetRequestContext());
   auth.StartClientLogin("username",
                         "password",
                         "service",
                         std::string(),
                         std::string(),
                         GaiaAuthFetcher::HostedAccountsAllowed);
 
   URLFetcher::set_factory(NULL);
   EXPECT_TRUE(auth.HasPendingFetch());
-  auth.OnURLFetchComplete(NULL,
-                          client_login_source_,
-                          URLRequestStatus(URLRequestStatus::SUCCESS, 0),
-                          RC_REQUEST_OK,
-                          cookies_,
-                          "SID=sid\nLSID=lsid\nAuth=auth\n");
+  auth.OnURLFetchComplete(
+      NULL,
+      client_login_source_,
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
+      RC_REQUEST_OK,
+      cookies_,
+      "SID=sid\nLSID=lsid\nAuth=auth\n");
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, FullTokenSuccess) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenSuccess("service", "token"))
       .Times(1);
 
   TestingProfile profile;
   TestURLFetcherFactory factory;
   URLFetcher::set_factory(&factory);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
   auth.StartIssueAuthToken("sid", "lsid", "service");
 
   URLFetcher::set_factory(NULL);
   EXPECT_TRUE(auth.HasPendingFetch());
-  auth.OnURLFetchComplete(NULL,
-                          issue_auth_token_source_,
-                          URLRequestStatus(URLRequestStatus::SUCCESS, 0),
-                          RC_REQUEST_OK,
-                          cookies_,
-                          "token");
+  auth.OnURLFetchComplete(
+      NULL,
+      issue_auth_token_source_,
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
+      RC_REQUEST_OK,
+      cookies_,
+      "token");
   EXPECT_FALSE(auth.HasPendingFetch());
 }
 
 TEST_F(GaiaAuthFetcherTest, FullTokenFailure) {
   MockGaiaConsumer consumer;
   EXPECT_CALL(consumer, OnIssueAuthTokenFailure("service", _))
       .Times(1);
 
   TestingProfile profile;
   TestURLFetcherFactory factory;
   URLFetcher::set_factory(&factory);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
   auth.StartIssueAuthToken("sid", "lsid", "service");
 
   URLFetcher::set_factory(NULL);
   EXPECT_TRUE(auth.HasPendingFetch());
-  auth.OnURLFetchComplete(NULL,
-                          issue_auth_token_source_,
-                          URLRequestStatus(URLRequestStatus::SUCCESS, 0),
-                          RC_FORBIDDEN,
-                          cookies_,
-                          "");
+  auth.OnURLFetchComplete(
+      NULL,
+      issue_auth_token_source_,
+      net::URLRequestStatus(net::URLRequestStatus::SUCCESS, 0),
+      RC_FORBIDDEN,
+      cookies_,
+      "");
   EXPECT_FALSE(auth.HasPendingFetch());
 }