summaryrefslogtreecommitdiff
path: root/chromium/net/http/http_stream_factory.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-05 17:15:33 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-11 07:47:18 +0000
commit7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch)
treea3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/net/http/http_stream_factory.h
parent6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff)
downloadqtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/http/http_stream_factory.h')
-rw-r--r--chromium/net/http/http_stream_factory.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/chromium/net/http/http_stream_factory.h b/chromium/net/http/http_stream_factory.h
index c4a95798cc5..ecbe88202fe 100644
--- a/chromium/net/http/http_stream_factory.h
+++ b/chromium/net/http/http_stream_factory.h
@@ -22,9 +22,14 @@
// introduce any link dependency to net/websockets.
#include "net/websockets/websocket_handshake_stream_base.h"
+namespace base {
+namespace trace_event {
+class ProcessMemoryDump;
+}
+}
+
namespace net {
-class AuthCredentials;
class BidirectionalStreamImpl;
class HostMappingRules;
class HttpAuthController;
@@ -163,8 +168,7 @@ class NET_EXPORT_PRIVATE HttpStreamRequest {
// will have been called. It now becomes the delegate's responsibility
// to collect the necessary credentials, and then call this method to
// resume the HttpStream creation process.
- virtual int RestartTunnelWithProxyAuth(
- const AuthCredentials& credentials) = 0;
+ virtual int RestartTunnelWithProxyAuth() = 0;
// Called when the priority of the parent transaction changes.
virtual void SetPriority(RequestPriority priority) = 0;
@@ -235,6 +239,12 @@ class NET_EXPORT HttpStreamFactory {
virtual const HostMappingRules* GetHostMappingRules() const = 0;
+ // Dumps memory allocation stats. |parent_dump_absolute_name| is the name
+ // used by the parent MemoryAllocatorDump in the memory dump hierarchy.
+ virtual void DumpMemoryStats(
+ base::trace_event::ProcessMemoryDump* pmd,
+ const std::string& parent_absolute_name) const = 0;
+
protected:
HttpStreamFactory();