diff options
Diffstat (limited to 'chrome/browser/debugger')
3 files changed, 20 insertions, 19 deletions
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc index 5327008..8c1bea9 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc @@ -108,7 +108,8 @@ void DevToolsHttpProtocolHandler::OnHttpRequest( } // Proxy static files from chrome://devtools/*. - URLRequest* request = new URLRequest(GURL("chrome:/" + info.path), this); + net::URLRequest* request = new net::URLRequest( + GURL("chrome:/" + info.path), this); Bind(request, socket); request->set_context( Profile::GetDefaultRequestContext()->GetURLRequestContext()); @@ -144,9 +145,9 @@ void DevToolsHttpProtocolHandler::OnClose(HttpListenSocket* socket) { SocketToRequestsMap::iterator it = socket_to_requests_io_.find(socket); if (it != socket_to_requests_io_.end()) { // Dispose delegating socket. - for (std::set<URLRequest*>::iterator it2 = it->second.begin(); + for (std::set<net::URLRequest*>::iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) { - URLRequest* request = *it2; + net::URLRequest* request = *it2; request->Cancel(); request_to_socket_io_.erase(request); request_to_buffer_io_.erase(request); @@ -273,7 +274,7 @@ void DevToolsHttpProtocolHandler::OnCloseUI(HttpListenSocket* socket) { socket_to_client_host_ui_.erase(socket); } -void DevToolsHttpProtocolHandler::OnResponseStarted(URLRequest* request) { +void DevToolsHttpProtocolHandler::OnResponseStarted(net::URLRequest* request) { RequestToSocketMap::iterator it = request_to_socket_io_.find(request); if (it == request_to_socket_io_.end()) return; @@ -307,7 +308,7 @@ void DevToolsHttpProtocolHandler::OnResponseStarted(URLRequest* request) { OnReadCompleted(request, bytes_read); } -void DevToolsHttpProtocolHandler::OnReadCompleted(URLRequest* request, +void DevToolsHttpProtocolHandler::OnReadCompleted(net::URLRequest* request, int bytes_read) { RequestToSocketMap::iterator it = request_to_socket_io_.find(request); if (it == request_to_socket_io_.end()) @@ -341,21 +342,21 @@ void DevToolsHttpProtocolHandler::Teardown() { server_ = NULL; } -void DevToolsHttpProtocolHandler::Bind(URLRequest* request, +void DevToolsHttpProtocolHandler::Bind(net::URLRequest* request, HttpListenSocket* socket) { request_to_socket_io_[request] = socket; SocketToRequestsMap::iterator it = socket_to_requests_io_.find(socket); if (it == socket_to_requests_io_.end()) { - std::pair<HttpListenSocket*, std::set<URLRequest*> > value( + std::pair<HttpListenSocket*, std::set<net::URLRequest*> > value( socket, - std::set<URLRequest*>()); + std::set<net::URLRequest*>()); it = socket_to_requests_io_.insert(value).first; } it->second.insert(request); request_to_buffer_io_[request] = new net::IOBuffer(kBufferSize); } -void DevToolsHttpProtocolHandler::RequestCompleted(URLRequest* request) { +void DevToolsHttpProtocolHandler::RequestCompleted(net::URLRequest* request) { RequestToSocketMap::iterator it = request_to_socket_io_.find(request); if (it == request_to_socket_io_.end()) return; diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.h b/chrome/browser/debugger/devtools_http_protocol_handler.h index 332fbaa..5be89d2 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.h +++ b/chrome/browser/debugger/devtools_http_protocol_handler.h @@ -19,7 +19,7 @@ class TabContents; class DevToolsHttpProtocolHandler : public HttpListenSocket::Delegate, - public URLRequest::Delegate, + public net::URLRequest::Delegate, public base::RefCountedThreadSafe<DevToolsHttpProtocolHandler> { public: explicit DevToolsHttpProtocolHandler(int port); @@ -51,14 +51,14 @@ class DevToolsHttpProtocolHandler const std::string& data); virtual void OnCloseUI(HttpListenSocket* socket); - // URLRequest::Delegate implementation. - virtual void OnResponseStarted(URLRequest* request); - virtual void OnReadCompleted(URLRequest* request, int bytes_read); + // net::URLRequest::Delegate implementation. + virtual void OnResponseStarted(net::URLRequest* request); + virtual void OnReadCompleted(net::URLRequest* request, int bytes_read); void Init(); void Teardown(); - void Bind(URLRequest* request, HttpListenSocket* socket); - void RequestCompleted(URLRequest* request); + void Bind(net::URLRequest* request, HttpListenSocket* socket); + void RequestCompleted(net::URLRequest* request); void Send200(HttpListenSocket* socket, const std::string& data, @@ -73,13 +73,13 @@ class DevToolsHttpProtocolHandler int port_; scoped_refptr<HttpListenSocket> server_; - typedef std::map<URLRequest*, HttpListenSocket*> + typedef std::map<net::URLRequest*, HttpListenSocket*> RequestToSocketMap; RequestToSocketMap request_to_socket_io_; - typedef std::map<HttpListenSocket*, std::set<URLRequest*> > + typedef std::map<HttpListenSocket*, std::set<net::URLRequest*> > SocketToRequestsMap; SocketToRequestsMap socket_to_requests_io_; - typedef std::map<URLRequest*, scoped_refptr<net::IOBuffer> > + typedef std::map<net::URLRequest*, scoped_refptr<net::IOBuffer> > BuffersMap; BuffersMap request_to_buffer_io_; typedef std::map<HttpListenSocket*, DevToolsClientHost*> diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc index 35368a1..c5d49f1 100644 --- a/chrome/browser/debugger/devtools_netlog_observer.cc +++ b/chrome/browser/debugger/devtools_netlog_observer.cc @@ -126,7 +126,7 @@ DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() { } // static -void DevToolsNetLogObserver::PopulateResponseInfo(URLRequest* request, +void DevToolsNetLogObserver::PopulateResponseInfo(net::URLRequest* request, ResourceResponse* response) { if (!(request->load_flags() & net::LOAD_REPORT_RAW_HEADERS)) return; |