OLD | NEW |
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 "cloud_print/service/service_state.h" | 5 #include "cloud_print/service/service_state.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/json/json_writer.h" | 8 #include "base/json/json_writer.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "net/base/escape.h" | 13 #include "net/base/escape.h" |
14 #include "net/base/io_buffer.h" | 14 #include "net/base/io_buffer.h" |
15 #include "net/base/load_flags.h" | 15 #include "net/base/load_flags.h" |
16 #include "net/base/upload_data.h" | 16 #include "net/base/upload_bytes_element_reader.h" |
| 17 #include "net/base/upload_data_stream.h" |
17 #include "net/url_request/url_request.h" | 18 #include "net/url_request/url_request.h" |
18 #include "net/url_request/url_request_context.h" | 19 #include "net/url_request/url_request_context.h" |
19 #include "net/url_request/url_request_context_builder.h" | 20 #include "net/url_request/url_request_context_builder.h" |
20 | 21 |
21 namespace { | 22 namespace { |
22 | 23 |
23 const char kCloudPrintJsonName[] = "cloud_print"; | 24 const char kCloudPrintJsonName[] = "cloud_print"; |
24 const char kEnabledOptionName[] = "enabled"; | 25 const char kEnabledOptionName[] = "enabled"; |
25 | 26 |
26 const char kEmailOptionName[] = "email"; | 27 const char kEmailOptionName[] = "email"; |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 post_body += "&Passwd=" + net::EscapeUrlEncodedData(password, true); | 173 post_body += "&Passwd=" + net::EscapeUrlEncodedData(password, true); |
173 post_body += "&source=" + net::EscapeUrlEncodedData("CP-Service", true); | 174 post_body += "&source=" + net::EscapeUrlEncodedData("CP-Service", true); |
174 post_body += "&service=" + net::EscapeUrlEncodedData(service, true); | 175 post_body += "&service=" + net::EscapeUrlEncodedData(service, true); |
175 | 176 |
176 net::URLRequest request(url, &fetcher_delegate, context.get()); | 177 net::URLRequest request(url, &fetcher_delegate, context.get()); |
177 int load_flags = request.load_flags(); | 178 int load_flags = request.load_flags(); |
178 load_flags = load_flags | net::LOAD_DO_NOT_SEND_COOKIES; | 179 load_flags = load_flags | net::LOAD_DO_NOT_SEND_COOKIES; |
179 load_flags = load_flags | net::LOAD_DO_NOT_SAVE_COOKIES; | 180 load_flags = load_flags | net::LOAD_DO_NOT_SAVE_COOKIES; |
180 request.set_load_flags(load_flags); | 181 request.set_load_flags(load_flags); |
181 | 182 |
182 scoped_refptr<net::UploadData> upload_data(new net::UploadData()); | 183 scoped_ptr<net::UploadElementReader> reader( |
183 upload_data->AppendBytes(post_body.c_str(), post_body.size()); | 184 net::UploadOwnedBytesElementReader::CreateWithString(post_body)); |
184 request.set_upload(upload_data); | 185 request.set_upload(make_scoped_ptr( |
| 186 net::UploadDataStream::CreateWithReader(reader.Pass(), 0))); |
185 request.SetExtraRequestHeaderByName( | 187 request.SetExtraRequestHeaderByName( |
186 "Content-Type", "application/x-www-form-urlencoded", true); | 188 "Content-Type", "application/x-www-form-urlencoded", true); |
187 request.set_method("POST"); | 189 request.set_method("POST"); |
188 request.Start(); | 190 request.Start(); |
189 | 191 |
190 MessageLoop::current()->PostDelayedTask(FROM_HERE, | 192 MessageLoop::current()->PostDelayedTask(FROM_HERE, |
191 MessageLoop::QuitClosure(), | 193 MessageLoop::QuitClosure(), |
192 base::TimeDelta::FromMilliseconds(kRequestTimeoutMs)); | 194 base::TimeDelta::FromMilliseconds(kRequestTimeoutMs)); |
193 | 195 |
194 MessageLoop::current()->Run(); | 196 MessageLoop::current()->Run(); |
(...skipping 14 matching lines...) Expand all Loading... |
209 const std::string& password, | 211 const std::string& password, |
210 const std::string& proxy_id) { | 212 const std::string& proxy_id) { |
211 robot_token_.clear(); | 213 robot_token_.clear(); |
212 robot_email_.clear(); | 214 robot_email_.clear(); |
213 email_ = email; | 215 email_ = email; |
214 proxy_id_ = proxy_id; | 216 proxy_id_ = proxy_id; |
215 auth_token_ = LoginToGoogle("cloudprint", email_, password); | 217 auth_token_ = LoginToGoogle("cloudprint", email_, password); |
216 xmpp_auth_token_ = LoginToGoogle("chromiumsync", email_, password); | 218 xmpp_auth_token_ = LoginToGoogle("chromiumsync", email_, password); |
217 return IsValid(); | 219 return IsValid(); |
218 } | 220 } |
OLD | NEW |