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

Side by Side Diff: chrome/browser/google_apis/test_server/http_server.cc

Issue 11419283: google_apis: Remove some functions from test_server::HttpServer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years 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/browser/google_apis/test_server/http_server.h" 5 #include "chrome/browser/google_apis/test_server/http_server.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 DCHECK(StartsWithASCII(relative_url, "/", true /* case_sensitive */)) 157 DCHECK(StartsWithASCII(relative_url, "/", true /* case_sensitive */))
158 << relative_url; 158 << relative_url;
159 return base_url_.Resolve(relative_url); 159 return base_url_.Resolve(relative_url);
160 } 160 }
161 161
162 void HttpServer::RegisterRequestHandler( 162 void HttpServer::RegisterRequestHandler(
163 const HandleRequestCallback& callback) { 163 const HandleRequestCallback& callback) {
164 request_handlers_.push_back(callback); 164 request_handlers_.push_back(callback);
165 } 165 }
166 166
167 void HttpServer::RegisterDefaultResponse(
168 const std::string& relative_path,
169 const HttpResponse& default_response) {
170 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
171 DCHECK(StartsWithASCII(relative_path, "/", true /* case_sensitive */))
172 << relative_path;
173
174 const HandleRequestCallback callback =
175 base::Bind(&HandleDefaultRequest,
176 GetURL(relative_path),
177 default_response);
178 request_handlers_.push_back(callback);
179 }
180
181 void HttpServer::RegisterTextResponse(
182 const std::string& relative_path,
183 const std::string& content,
184 const std::string& content_type,
185 const ResponseCode response_code) {
186 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
187 DCHECK(StartsWithASCII(relative_path, "/", true /* case_sensitive */))
188 << relative_path;
189
190 HttpResponse default_response;
191 default_response.set_content(content);
192 default_response.set_content_type(content_type);
193 default_response.set_code(response_code);
194
195 RegisterDefaultResponse(relative_path, default_response);
196 }
197
198 void HttpServer::RegisterFileResponse(
199 const std::string& relative_path,
200 const FilePath& file_path,
201 const std::string& content_type,
202 const ResponseCode response_code) {
203 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
204 DCHECK(StartsWithASCII(relative_path, "/", true /* case_sensitive */))
205 << relative_path;
206
207 HttpResponse default_response;
208
209 std::string content;
210 const bool success = file_util::ReadFileToString(
211 file_path, &content);
212 default_response.set_content(content);
213 DCHECK(success) << "Failed to open the file: " << file_path.value();
214
215 default_response.set_content_type(content_type);
216 default_response.set_code(response_code);
217
218 RegisterDefaultResponse(relative_path, default_response);
219 }
220
221 void HttpServer::DidAccept(net::StreamListenSocket* server, 167 void HttpServer::DidAccept(net::StreamListenSocket* server,
222 net::StreamListenSocket* connection) { 168 net::StreamListenSocket* connection) {
223 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 169 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
224 170
225 HttpConnection* http_connection = new HttpConnection( 171 HttpConnection* http_connection = new HttpConnection(
226 connection, 172 connection,
227 base::Bind(&HttpServer::HandleRequest, weak_factory_.GetWeakPtr())); 173 base::Bind(&HttpServer::HandleRequest, weak_factory_.GetWeakPtr()));
228 connections_[connection] = http_connection; 174 connections_[connection] = http_connection;
229 } 175 }
230 176
(...skipping 29 matching lines...) Expand all
260 std::map<net::StreamListenSocket*, HttpConnection*>::iterator it = 206 std::map<net::StreamListenSocket*, HttpConnection*>::iterator it =
261 connections_.find(socket); 207 connections_.find(socket);
262 if (it == connections_.end()) { 208 if (it == connections_.end()) {
263 return NULL; 209 return NULL;
264 } 210 }
265 return it->second; 211 return it->second;
266 } 212 }
267 213
268 } // namespace test_server 214 } // namespace test_server
269 } // namespace google_apis 215 } // namespace google_apis
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698