summaryrefslogtreecommitdiffstats
path: root/chrome/common/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common/net')
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher.cc10
-rw-r--r--chrome/common/net/gaia/gaia_oauth_client.cc5
2 files changed, 6 insertions, 9 deletions
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc
index 08cb74b..992cb06 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc
@@ -16,7 +16,7 @@
#include "chrome/common/net/gaia/gaia_urls.h"
#include "chrome/common/net/gaia/google_service_auth_error.h"
#include "chrome/common/net/http_return.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_context_getter.h"
@@ -131,12 +131,8 @@ content::URLFetcher* GaiaAuthFetcher::CreateGaiaFetcher(
const GURL& gaia_gurl,
bool send_cookies,
content::URLFetcherDelegate* delegate) {
-
- URLFetcher* to_return =
- URLFetcher::Create(0,
- gaia_gurl,
- URLFetcher::POST,
- delegate);
+ content::URLFetcher* to_return = content::URLFetcher::Create(
+ 0, gaia_gurl, content::URLFetcher::POST, delegate);
to_return->SetRequestContext(getter);
to_return->SetUploadData("application/x-www-form-urlencoded", body);
diff --git a/chrome/common/net/gaia/gaia_oauth_client.cc b/chrome/common/net/gaia/gaia_oauth_client.cc
index 5a1e5b5..7c0bcaa 100644
--- a/chrome/common/net/gaia/gaia_oauth_client.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/common/net/http_return.h"
-#include "content/common/net/url_fetcher.h"
+#include "content/public/common/url_fetcher.h"
#include "content/public/common/url_fetcher_delegate.h"
#include "googleurl/src/gurl.h"
#include "net/base/escape.h"
@@ -96,7 +96,8 @@ void GaiaOAuthClient::Core::MakeGaiaRequest(
DCHECK(!request_.get()) << "Tried to fetch two things at once!";
delegate_ = delegate;
num_retries_ = 0;
- request_.reset(URLFetcher::Create(0, gaia_url_, URLFetcher::POST, this));
+ request_.reset(content::URLFetcher::Create(
+ 0, gaia_url_, content::URLFetcher::POST, this));
request_->SetRequestContext(request_context_getter_);
request_->SetUploadData("application/x-www-form-urlencoded", post_body);
request_->SetMaxRetries(max_retries);