summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 23:14:25 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-07 23:14:25 +0000
commit88e6b6f3251af7092432c33b7d372a17c7169904 (patch)
tree3fde374eed02ee05026449729952f0364609971b /webkit/tools
parentda244100d3ac663a1f827fc712dc508c7761d207 (diff)
downloadchromium_src-88e6b6f3251af7092432c33b7d372a17c7169904.zip
chromium_src-88e6b6f3251af7092432c33b7d372a17c7169904.tar.gz
chromium_src-88e6b6f3251af7092432c33b7d372a17c7169904.tar.bz2
Pass HttpRequestHeaders to URLRequest::SetExtraRequestHeaders().
BUG=22588 Review URL: http://codereview.chromium.org/1998008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_resource_loader_bridge.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 5cfbea0..690f169 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -44,6 +44,7 @@
#include "net/base/net_util.h"
#include "net/base/static_cookie_policy.h"
#include "net/base/upload_data.h"
+#include "net/http/http_request_headers.h"
#include "net/http/http_response_headers.h"
#include "net/proxy/proxy_service.h"
#include "net/url_request/url_request.h"
@@ -215,7 +216,9 @@ class RequestProxy : public URLRequest::Delegate,
request_->set_method(params->method);
request_->set_first_party_for_cookies(params->first_party_for_cookies);
request_->set_referrer(params->referrer.spec());
- request_->SetExtraRequestHeaders(params->headers);
+ net::HttpRequestHeaders headers;
+ headers.AddHeadersFromString(params->headers);
+ request_->SetExtraRequestHeaders(headers);
request_->set_load_flags(params->load_flags);
request_->set_upload(params->upload.get());
request_->set_context(request_context);