Update to Chromium revision 66afc5e5 (#540276)

This commit is contained in:
Marshall Greenblatt
2018-03-20 16:15:08 -04:00
parent 4fb6e1ba29
commit 7a59914f97
128 changed files with 1921 additions and 1477 deletions

View File

@@ -1,10 +1,10 @@
diff --git net/url_request/url_request.h net/url_request/url_request.h
index 60fbf78c7886..9597011602ba 100644
index c0fc8aeee535..0a16da034f80 100644
--- net/url_request/url_request.h
+++ net/url_request/url_request.h
@@ -693,10 +693,10 @@ class NET_EXPORT URLRequest : public base::SupportsUserData {
// called with a response from the server.
void SetResponseHeadersCallback(ResponseHeadersCallback callback);
@@ -705,10 +705,10 @@ class NET_EXPORT URLRequest : public base::SupportsUserData {
void set_socket_tag(const SocketTag& socket_tag);
const SocketTag& socket_tag() const { return socket_tag_; }
- protected:
// Allow the URLRequestJob class to control the is_pending() flag.