diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:25 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 15:22:44 +0200 |
commit | 4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78 (patch) | |
tree | 9dc9c3ba8ab461f7ee3d444222246be5ed55ae3f /chromium/content/browser/security_exploit_browsertest.cc | |
parent | 19de26b7efd6b993f2af26cf435f04c716d3f5bc (diff) | |
parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
download | qtwebengine-chromium-4f62685dfa09d64a8fcd2de9ed0adb7fe5747b78.tar.gz |
Merge branch 'upstream-master' into 58-based
Change-Id: I8c280ca9068fdda9cf6276725bfb8608eccb497a
Diffstat (limited to 'chromium/content/browser/security_exploit_browsertest.cc')
-rw-r--r-- | chromium/content/browser/security_exploit_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/content/browser/security_exploit_browsertest.cc b/chromium/content/browser/security_exploit_browsertest.cc index 3d61efb0e97..780d8223741 100644 --- a/chromium/content/browser/security_exploit_browsertest.cc +++ b/chromium/content/browser/security_exploit_browsertest.cc @@ -421,7 +421,7 @@ void OnHttpHeaderReceived(const std::string& header, int child_process_id, content::ResourceContext* resource_context, OnHeaderProcessedCallback callback) { - callback.Run(false, content::bad_message::RDH_ILLEGAL_ORIGIN); + callback.Run(HeaderInterceptorResult::KILL); } // Renderer processes should not be able to spoof Origin HTTP headers. |