Index: chrome/common/net/gaia/gaia_auth_fetcher.cc |
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc |
index 0499168bf8043d05525d2efc159d3405bdf32921..805f1583c3c97ea82c971b1b44e1438e78f4dc2f 100644 |
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc |
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc |
@@ -1,4 +1,4 @@ |
-// 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. |
@@ -314,10 +314,10 @@ void GaiaAuthFetcher::StartGetUserInfo(const std::string& lsid, |
// static |
GoogleServiceAuthError GaiaAuthFetcher::GenerateAuthError( |
const std::string& data, |
- const URLRequestStatus& status) { |
+ const net::URLRequestStatus& status) { |
if (!status.is_success()) { |
- if (status.status() == URLRequestStatus::CANCELED) { |
+ if (status.status() == net::URLRequestStatus::CANCELED) { |
return GoogleServiceAuthError(GoogleServiceAuthError::REQUEST_CANCELED); |
} else { |
LOG(WARNING) << "Could not reach Google Accounts servers: errno " |
@@ -364,7 +364,7 @@ GoogleServiceAuthError GaiaAuthFetcher::GenerateAuthError( |
} |
void GaiaAuthFetcher::OnClientLoginFetched(const std::string& data, |
- const URLRequestStatus& status, |
+ const net::URLRequestStatus& status, |
int response_code) { |
if (status.is_success() && response_code == RC_REQUEST_OK) { |
@@ -382,7 +382,7 @@ void GaiaAuthFetcher::OnClientLoginFetched(const std::string& data, |
void GaiaAuthFetcher::OnIssueAuthTokenFetched( |
const std::string& data, |
- const URLRequestStatus& status, |
+ const net::URLRequestStatus& status, |
int response_code) { |
if (status.is_success() && response_code == RC_REQUEST_OK) { |
// Only the bare token is returned in the body of this Gaia call |
@@ -396,7 +396,7 @@ void GaiaAuthFetcher::OnIssueAuthTokenFetched( |
void GaiaAuthFetcher::OnGetUserInfoFetched( |
const std::string& data, |
- const URLRequestStatus& status, |
+ const net::URLRequestStatus& status, |
int response_code) { |
using std::vector; |
using std::string; |
@@ -420,7 +420,7 @@ void GaiaAuthFetcher::OnGetUserInfoFetched( |
void GaiaAuthFetcher::OnURLFetchComplete(const URLFetcher* source, |
const GURL& url, |
- const URLRequestStatus& status, |
+ const net::URLRequestStatus& status, |
int response_code, |
const ResponseCookies& cookies, |
const std::string& data) { |