Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: chrome/service/cloud_print/cloud_print_url_fetcher.cc

Issue 10412050: Change most content::URLFetcher references to net::URLFetcher (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ChromeOS, address comments Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/service/cloud_print/cloud_print_url_fetcher.h" 5 #include "chrome/service/cloud_print/cloud_print_url_fetcher.h"
6 6
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/common/cloud_print/cloud_print_helpers.h" 9 #include "chrome/common/cloud_print/cloud_print_helpers.h"
10 #include "chrome/service/cloud_print/cloud_print_consts.h" 10 #include "chrome/service/cloud_print/cloud_print_consts.h"
11 #include "chrome/service/cloud_print/cloud_print_helpers.h" 11 #include "chrome/service/cloud_print/cloud_print_helpers.h"
12 #include "chrome/service/cloud_print/cloud_print_token_store.h" 12 #include "chrome/service/cloud_print/cloud_print_token_store.h"
13 #include "chrome/service/net/service_url_request_context.h" 13 #include "chrome/service/net/service_url_request_context.h"
14 #include "chrome/service/service_process.h" 14 #include "chrome/service/service_process.h"
15 #include "content/public/common/url_fetcher.h"
15 #include "googleurl/src/gurl.h" 16 #include "googleurl/src/gurl.h"
16 #include "net/http/http_status_code.h" 17 #include "net/http/http_status_code.h"
17 #include "net/url_request/url_request_status.h" 18 #include "net/url_request/url_request_status.h"
18 19
19 CloudPrintURLFetcher::CloudPrintURLFetcher() 20 CloudPrintURLFetcher::CloudPrintURLFetcher()
20 : delegate_(NULL), 21 : delegate_(NULL),
21 num_retries_(0) { 22 num_retries_(0) {
22 } 23 }
23 24
24 bool CloudPrintURLFetcher::IsSameRequest(const net::URLFetcher* source) { 25 bool CloudPrintURLFetcher::IsSameRequest(const net::URLFetcher* source) {
25 return (request_.get() == source); 26 return (request_.get() == source);
26 } 27 }
27 28
28 void CloudPrintURLFetcher::StartGetRequest( 29 void CloudPrintURLFetcher::StartGetRequest(
29 const GURL& url, 30 const GURL& url,
30 Delegate* delegate, 31 Delegate* delegate,
31 int max_retries, 32 int max_retries,
32 const std::string& additional_headers) { 33 const std::string& additional_headers) {
33 StartRequestHelper(url, 34 StartRequestHelper(url,
34 content::URLFetcher::GET, 35 net::URLFetcher::GET,
35 delegate, 36 delegate,
36 max_retries, 37 max_retries,
37 std::string(), 38 std::string(),
38 std::string(), 39 std::string(),
39 additional_headers); 40 additional_headers);
40 } 41 }
41 42
42 void CloudPrintURLFetcher::StartPostRequest( 43 void CloudPrintURLFetcher::StartPostRequest(
43 const GURL& url, 44 const GURL& url,
44 Delegate* delegate, 45 Delegate* delegate,
45 int max_retries, 46 int max_retries,
46 const std::string& post_data_mime_type, 47 const std::string& post_data_mime_type,
47 const std::string& post_data, 48 const std::string& post_data,
48 const std::string& additional_headers) { 49 const std::string& additional_headers) {
49 StartRequestHelper(url, 50 StartRequestHelper(url,
50 content::URLFetcher::POST, 51 net::URLFetcher::POST,
51 delegate, 52 delegate,
52 max_retries, 53 max_retries,
53 post_data_mime_type, 54 post_data_mime_type,
54 post_data, 55 post_data,
55 additional_headers); 56 additional_headers);
56 } 57 }
57 58
58 void CloudPrintURLFetcher::OnURLFetchComplete( 59 void CloudPrintURLFetcher::OnURLFetchComplete(
59 const net::URLFetcher* source) { 60 const net::URLFetcher* source) {
60 VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << source->GetURL() 61 VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << source->GetURL()
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // may have changed. 127 // may have changed.
127 SetupRequestHeaders(); 128 SetupRequestHeaders();
128 request_->SetRequestContext(GetRequestContextGetter()); 129 request_->SetRequestContext(GetRequestContextGetter());
129 request_->Start(); 130 request_->Start();
130 } 131 }
131 } 132 }
132 } 133 }
133 134
134 void CloudPrintURLFetcher::StartRequestHelper( 135 void CloudPrintURLFetcher::StartRequestHelper(
135 const GURL& url, 136 const GURL& url,
136 content::URLFetcher::RequestType request_type, 137 net::URLFetcher::RequestType request_type,
137 Delegate* delegate, 138 Delegate* delegate,
138 int max_retries, 139 int max_retries,
139 const std::string& post_data_mime_type, 140 const std::string& post_data_mime_type,
140 const std::string& post_data, 141 const std::string& post_data,
141 const std::string& additional_headers) { 142 const std::string& additional_headers) {
142 DCHECK(delegate); 143 DCHECK(delegate);
143 // Persist the additional headers in case we need to retry the request. 144 // Persist the additional headers in case we need to retry the request.
144 additional_headers_ = additional_headers; 145 additional_headers_ = additional_headers;
145 request_.reset(content::URLFetcher::Create(url, request_type, this)); 146 request_.reset(content::URLFetcher::Create(url, request_type, this));
146 request_->SetRequestContext(GetRequestContextGetter()); 147 request_->SetRequestContext(GetRequestContextGetter());
147 // Since we implement our own retry logic, disable the retry in URLFetcher. 148 // Since we implement our own retry logic, disable the retry in URLFetcher.
148 request_->SetAutomaticallyRetryOn5xx(false); 149 request_->SetAutomaticallyRetryOn5xx(false);
149 request_->SetMaxRetries(max_retries); 150 request_->SetMaxRetries(max_retries);
150 delegate_ = delegate; 151 delegate_ = delegate;
151 SetupRequestHeaders(); 152 SetupRequestHeaders();
152 if (request_type == content::URLFetcher::POST) { 153 if (request_type == net::URLFetcher::POST) {
153 request_->SetUploadData(post_data_mime_type, post_data); 154 request_->SetUploadData(post_data_mime_type, post_data);
154 } 155 }
155 156
156 request_->Start(); 157 request_->Start();
157 } 158 }
158 159
159 void CloudPrintURLFetcher::SetupRequestHeaders() { 160 void CloudPrintURLFetcher::SetupRequestHeaders() {
160 std::string headers = delegate_->GetAuthHeader(); 161 std::string headers = delegate_->GetAuthHeader();
161 if (!headers.empty()) 162 if (!headers.empty())
162 headers += "\r\n"; 163 headers += "\r\n";
163 headers += cloud_print::kChromeCloudPrintProxyHeader; 164 headers += cloud_print::kChromeCloudPrintProxyHeader;
164 if (!additional_headers_.empty()) { 165 if (!additional_headers_.empty()) {
165 headers += "\r\n"; 166 headers += "\r\n";
166 headers += additional_headers_; 167 headers += additional_headers_;
167 } 168 }
168 request_->SetExtraRequestHeaders(headers); 169 request_->SetExtraRequestHeaders(headers);
169 } 170 }
170 171
171 CloudPrintURLFetcher::~CloudPrintURLFetcher() {} 172 CloudPrintURLFetcher::~CloudPrintURLFetcher() {}
172 173
173 net::URLRequestContextGetter* CloudPrintURLFetcher::GetRequestContextGetter() { 174 net::URLRequestContextGetter* CloudPrintURLFetcher::GetRequestContextGetter() {
174 ServiceURLRequestContextGetter* getter = 175 ServiceURLRequestContextGetter* getter =
175 g_service_process->GetServiceURLRequestContextGetter(); 176 g_service_process->GetServiceURLRequestContextGetter();
176 // Now set up the user agent for cloudprint. 177 // Now set up the user agent for cloudprint.
177 std::string user_agent = getter->user_agent(); 178 std::string user_agent = getter->user_agent();
178 base::StringAppendF(&user_agent, " %s", kCloudPrintUserAgent); 179 base::StringAppendF(&user_agent, " %s", kCloudPrintUserAgent);
179 getter->set_user_agent(user_agent); 180 getter->set_user_agent(user_agent);
180 return getter; 181 return getter;
181 } 182 }
OLDNEW
« no previous file with comments | « chrome/service/cloud_print/cloud_print_url_fetcher.h ('k') | chrome/service/gaia/service_gaia_authenticator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698