BASELINE: Update Chromium to 51.0.2704.41

Also adds in all smaller components by reversing logic for exclusion.

Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

17 files changed, 37 insertions, 50 deletions

diff --git a/chromium/jingle/BUILD.gn b/chromium/jingle/BUILD.gn
index 10f2b2b5fd7..15f45e1a4ea 100644
--- a/chromium/jingle/BUILD.gn
+++ b/chromium/jingle/BUILD.gn
@@ -121,15 +121,6 @@ if (enable_webrtc || !is_android) {
     ]
   }
 
-  # TODO(GYP): Delete this after we've converted everything to GN.
-  # The _run targets exist only for compatibility w/ GYP.
-  group("jingle_unittests_run") {
-    testonly = true
-    deps = [
-      ":jingle_unittests",
-    ]
-  }
-
   # GYP version: jingle/jingle.gyp:jingle_unittests
   test("jingle_unittests") {
     sources = [
diff --git a/chromium/jingle/glue/chrome_async_socket.cc b/chromium/jingle/glue/chrome_async_socket.cc
index 52b35b52f3a..38bca588120 100644
--- a/chromium/jingle/glue/chrome_async_socket.cc
+++ b/chromium/jingle/glue/chrome_async_socket.cc
@@ -18,7 +18,6 @@
 #include "net/base/address_list.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
-#include "net/base/net_util.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
diff --git a/chromium/jingle/glue/chrome_async_socket_unittest.cc b/chromium/jingle/glue/chrome_async_socket_unittest.cc
index fd8193da52b..d4c774d40f9 100644
--- a/chromium/jingle/glue/chrome_async_socket_unittest.cc
+++ b/chromium/jingle/glue/chrome_async_socket_unittest.cc
@@ -16,8 +16,8 @@
 #include "base/message_loop/message_pump_default.h"
 #include "jingle/glue/resolving_client_socket_factory.h"
 #include "net/base/address_list.h"
+#include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
-#include "net/base/net_util.h"
 #include "net/cert/mock_cert_verifier.h"
 #include "net/http/transport_security_state.h"
 #include "net/socket/socket_test_util.h"
@@ -175,10 +175,8 @@ class ChromeAsyncSocketTest
         &ssl_socket_data_provider_);
 
     // Fake DNS resolution for |addr_| and pass it to the factory.
-    net::IPAddressNumber resolved_addr;
-    EXPECT_TRUE(net::ParseIPLiteralToNumber("127.0.0.1", &resolved_addr));
-    const net::AddressList address_list =
-        net::AddressList::CreateFromIPAddress(resolved_addr, addr_.port());
+    const net::AddressList address_list = net::AddressList::CreateFromIPAddress(
+        net::IPAddress::IPv4Localhost(), addr_.port());
     scoped_ptr<MockXmppClientSocketFactory> mock_xmpp_client_socket_factory(
         new MockXmppClientSocketFactory(
             mock_client_socket_factory.release(),
diff --git a/chromium/jingle/glue/fake_ssl_client_socket.cc b/chromium/jingle/glue/fake_ssl_client_socket.cc
index a61d3591659..583b54e1eef 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket.cc
+++ b/chromium/jingle/glue/fake_ssl_client_socket.cc
@@ -331,10 +331,6 @@ bool FakeSSLClientSocket::WasEverUsed() const {
   return transport_socket_->WasEverUsed();
 }
 
-bool FakeSSLClientSocket::UsingTCPFastOpen() const {
-  return transport_socket_->UsingTCPFastOpen();
-}
-
 bool FakeSSLClientSocket::WasNpnNegotiated() const {
   return transport_socket_->WasNpnNegotiated();
 }
diff --git a/chromium/jingle/glue/fake_ssl_client_socket.h b/chromium/jingle/glue/fake_ssl_client_socket.h
index 5bd4a0d27e7..f4a2040d94d 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket.h
+++ b/chromium/jingle/glue/fake_ssl_client_socket.h
@@ -64,7 +64,6 @@ class FakeSSLClientSocket : public net::StreamSocket {
   void SetSubresourceSpeculation() override;
   void SetOmniboxSpeculation() override;
   bool WasEverUsed() const override;
-  bool UsingTCPFastOpen() const override;
   bool WasNpnNegotiated() const override;
   net::NextProto GetNegotiatedProtocol() const override;
   bool GetSSLInfo(net::SSLInfo* ssl_info) override;
diff --git a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
index 50f74578499..aa1cfb3b5aa 100644
--- a/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
+++ b/chromium/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -15,6 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "net/base/io_buffer.h"
+#include "net/base/ip_address.h"
 #include "net/base/test_completion_callback.h"
 #include "net/log/net_log.h"
 #include "net/socket/socket_test_util.h"
@@ -279,7 +280,7 @@ TEST_F(FakeSSLClientSocketTest, PassThroughMethods) {
   scoped_ptr<MockClientSocket> mock_client_socket(new MockClientSocket());
   const int kReceiveBufferSize = 10;
   const int kSendBufferSize = 20;
-  net::IPEndPoint ip_endpoint(net::IPAddressNumber(net::kIPv4AddressSize), 80);
+  net::IPEndPoint ip_endpoint(net::IPAddress::IPv4AllZeros(), 80);
   const int kPeerAddress = 30;
   net::BoundNetLog net_log;
   EXPECT_CALL(*mock_client_socket, SetReceiveBufferSize(kReceiveBufferSize));
diff --git a/chromium/jingle/glue/proxy_resolving_client_socket.cc b/chromium/jingle/glue/proxy_resolving_client_socket.cc
index ae25614437f..c546cf97a20 100644
--- a/chromium/jingle/glue/proxy_resolving_client_socket.cc
+++ b/chromium/jingle/glue/proxy_resolving_client_socket.cc
@@ -5,12 +5,14 @@
 #include "jingle/glue/proxy_resolving_client_socket.h"
 
 #include <stdint.h>
+#include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
+#include "net/base/ip_address.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_auth_controller.h"
@@ -66,7 +68,6 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
   session_params.ssl_config_service = request_context->ssl_config_service();
   session_params.http_auth_handler_factory =
       request_context->http_auth_handler_factory();
-  session_params.network_delegate = request_context->network_delegate();
   session_params.http_server_properties =
       request_context->http_server_properties();
   session_params.net_log = request_context->net_log();
@@ -83,12 +84,12 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
         reference_params->testing_fixed_http_port;
     session_params.testing_fixed_https_port =
         reference_params->testing_fixed_https_port;
-    session_params.next_protos = reference_params->next_protos;
-    session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
-    session_params.forced_spdy_exclusions =
-        reference_params->forced_spdy_exclusions;
-    session_params.use_alternative_services =
-        reference_params->use_alternative_services;
+    session_params.enable_spdy31 = reference_params->enable_spdy31;
+    session_params.enable_http2 = reference_params->enable_http2;
+    session_params.parse_alternative_services =
+        reference_params->parse_alternative_services;
+    session_params.enable_alternative_service_with_different_host =
+        reference_params->enable_alternative_service_with_different_host;
   }
 
   network_session_.reset(new net::HttpNetworkSession(session_params));
@@ -139,6 +140,7 @@ int ProxyResolvingClientSocket::Connect(
   // First we try and resolve the proxy.
   int status = network_session_->proxy_service()->ResolveProxy(
       proxy_url_,
+      std::string(),
       net::LOAD_NORMAL,
       &proxy_info_,
       proxy_resolve_callback_,
@@ -290,7 +292,7 @@ int ProxyResolvingClientSocket::ReconsiderProxyAfterError(int error) {
   }
 
   int rv = network_session_->proxy_service()->ReconsiderProxyAfterError(
-      proxy_url_, net::LOAD_NORMAL, error, &proxy_info_,
+      proxy_url_, std::string(), net::LOAD_NORMAL, error, &proxy_info_,
       proxy_resolve_callback_, &pac_request_, NULL, bound_net_log_);
   if (rv == net::OK || rv == net::ERR_IO_PENDING) {
     CloseTransportSocket();
@@ -353,13 +355,13 @@ int ProxyResolvingClientSocket::GetPeerAddress(
   if (proxy_info_.is_direct())
     return transport_->socket()->GetPeerAddress(address);
 
-  net::IPAddressNumber ip_number;
-  if (!net::ParseIPLiteralToNumber(dest_host_port_pair_.host(), &ip_number)) {
+  net::IPAddress ip_address;
+  if (!ip_address.AssignFromIPLiteral(dest_host_port_pair_.host())) {
     // Do not expose the proxy IP address to the caller.
     return net::ERR_NAME_NOT_RESOLVED;
   }
 
-  *address = net::IPEndPoint(ip_number, dest_host_port_pair_.port());
+  *address = net::IPEndPoint(ip_address, dest_host_port_pair_.port());
   return net::OK;
 }
 
@@ -399,13 +401,6 @@ bool ProxyResolvingClientSocket::WasEverUsed() const {
   return false;
 }
 
-bool ProxyResolvingClientSocket::UsingTCPFastOpen() const {
-  if (transport_.get() && transport_->socket())
-    return transport_->socket()->UsingTCPFastOpen();
-  NOTREACHED();
-  return false;
-}
-
 bool ProxyResolvingClientSocket::WasNpnNegotiated() const {
   return false;
 }
diff --git a/chromium/jingle/glue/proxy_resolving_client_socket.h b/chromium/jingle/glue/proxy_resolving_client_socket.h
index 4e3af236cdb..14f51755d6b 100644
--- a/chromium/jingle/glue/proxy_resolving_client_socket.h
+++ b/chromium/jingle/glue/proxy_resolving_client_socket.h
@@ -20,6 +20,7 @@
 #include "net/log/net_log.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
+#include "net/socket/next_proto.h"
 #include "net/socket/stream_socket.h"
 #include "net/ssl/ssl_config_service.h"
 #include "url/gurl.h"
@@ -68,7 +69,6 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
   void SetSubresourceSpeculation() override;
   void SetOmniboxSpeculation() override;
   bool WasEverUsed() const override;
-  bool UsingTCPFastOpen() const override;
   bool WasNpnNegotiated() const override;
   net::NextProto GetNegotiatedProtocol() const override;
   bool GetSSLInfo(net::SSLInfo* ssl_info) override;
diff --git a/chromium/jingle/glue/thread_wrapper.h b/chromium/jingle/glue/thread_wrapper.h
index c14b8c1b2cc..f1f79f1be33 100644
--- a/chromium/jingle/glue/thread_wrapper.h
+++ b/chromium/jingle/glue/thread_wrapper.h
@@ -12,6 +12,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/chromium/jingle/glue/utils.cc b/chromium/jingle/glue/utils.cc
index 618ac5cab26..5a71779693c 100644
--- a/chromium/jingle/glue/utils.cc
+++ b/chromium/jingle/glue/utils.cc
@@ -11,8 +11,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
+#include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
-#include "net/base/net_util.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/socketaddress.h"
 #include "third_party/webrtc/p2p/base/candidate.h"
@@ -35,17 +35,16 @@ bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
       ip_endpoint->FromSockAddr(reinterpret_cast<sockaddr*>(&addr), size);
 }
 
-rtc::IPAddress IPAddressNumberToIPAddress(
-    const net::IPAddressNumber& ip_address_number) {
-  if (ip_address_number.size() == net::kIPv4AddressSize) {
+rtc::IPAddress NetIPAddressToRtcIPAddress(const net::IPAddress& ip_address) {
+  if (ip_address.IsIPv4()) {
     uint32_t address;
-    memcpy(&address, &ip_address_number[0], sizeof(uint32_t));
+    memcpy(&address, ip_address.bytes().data(), sizeof(uint32_t));
     address = rtc::NetworkToHost32(address);
     return rtc::IPAddress(address);
   }
-  if (ip_address_number.size() == net::kIPv6AddressSize) {
+  if (ip_address.IsIPv6()) {
     in6_addr address;
-    memcpy(&address, &ip_address_number[0], sizeof(in6_addr));
+    memcpy(&address, ip_address.bytes().data(), sizeof(in6_addr));
     return rtc::IPAddress(address);
   }
   return rtc::IPAddress();
diff --git a/chromium/jingle/glue/utils.h b/chromium/jingle/glue/utils.h
index 99c0ac0d406..1acd7496520 100644
--- a/chromium/jingle/glue/utils.h
+++ b/chromium/jingle/glue/utils.h
@@ -7,10 +7,10 @@
 
 #include <string>
 
-#include "net/base/ip_address_number.h"
 #include "third_party/webrtc/base/ipaddress.h"
 
 namespace net {
+class IPAddress;
 class IPEndPoint;
 }  // namespace net
 
@@ -32,8 +32,7 @@ bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
 bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
                                net::IPEndPoint* ip_endpoint);
 
-rtc::IPAddress IPAddressNumberToIPAddress(
-    const net::IPAddressNumber& ip_address_number);
+rtc::IPAddress NetIPAddressToRtcIPAddress(const net::IPAddress& ip_address);
 
 // Helper functions to serialize and deserialize P2P candidates.
 std::string SerializeP2PCandidate(const cricket::Candidate& candidate);
diff --git a/chromium/jingle/notifier/base/notifier_options.cc b/chromium/jingle/notifier/base/notifier_options.cc
index 3cf02ed88c9..9a149a3cc7d 100644
--- a/chromium/jingle/notifier/base/notifier_options.cc
+++ b/chromium/jingle/notifier/base/notifier_options.cc
@@ -15,6 +15,8 @@ NotifierOptions::NotifierOptions()
       notification_method(kDefaultNotificationMethod),
       auth_mechanism(kDefaultGaiaAuthMechanism) {}
 
+NotifierOptions::NotifierOptions(const NotifierOptions& other) = default;
+
 NotifierOptions::~NotifierOptions() { }
 
 }  // namespace notifier
diff --git a/chromium/jingle/notifier/base/notifier_options.h b/chromium/jingle/notifier/base/notifier_options.h
index 0d7b471969f..08f03a8e650 100644
--- a/chromium/jingle/notifier/base/notifier_options.h
+++ b/chromium/jingle/notifier/base/notifier_options.h
@@ -16,6 +16,7 @@ namespace notifier {
 
 struct NotifierOptions {
   NotifierOptions();
+  NotifierOptions(const NotifierOptions& other);
   ~NotifierOptions();
 
   // Indicates that the SSLTCP port (443) is to be tried before the the XMPP
diff --git a/chromium/jingle/notifier/communicator/login_settings.cc b/chromium/jingle/notifier/communicator/login_settings.cc
index 3f1d3dd4893..0c665d1019f 100644
--- a/chromium/jingle/notifier/communicator/login_settings.cc
+++ b/chromium/jingle/notifier/communicator/login_settings.cc
@@ -28,6 +28,8 @@ LoginSettings::LoginSettings(const buzz::XmppClientSettings& user_settings,
   DCHECK_GT(default_servers_.size(), 0u);
 }
 
+LoginSettings::LoginSettings(const LoginSettings& other) = default;
+
 LoginSettings::~LoginSettings() {}
 
 void LoginSettings::set_user_settings(
diff --git a/chromium/jingle/notifier/communicator/login_settings.h b/chromium/jingle/notifier/communicator/login_settings.h
index 00a95891c38..c797bdda262 100644
--- a/chromium/jingle/notifier/communicator/login_settings.h
+++ b/chromium/jingle/notifier/communicator/login_settings.h
@@ -23,6 +23,8 @@ class LoginSettings {
                 bool try_ssltcp_first,
                 const std::string& auth_mechanism);
 
+  LoginSettings(const LoginSettings& other);
+
   ~LoginSettings();
 
   // Copy constructor and assignment operator welcome.
diff --git a/chromium/jingle/notifier/listener/notification_defines.cc b/chromium/jingle/notifier/listener/notification_defines.cc
index f7c8f8fd3ad..8220f8d31be 100644
--- a/chromium/jingle/notifier/listener/notification_defines.cc
+++ b/chromium/jingle/notifier/listener/notification_defines.cc
@@ -55,6 +55,7 @@ bool RecipientListsEqual(const RecipientList& recipients1,
 }
 
 Notification::Notification() {}
+Notification::Notification(const Notification& other) = default;
 Notification::~Notification() {}
 
 bool Notification::Equals(const Notification& other) const {
diff --git a/chromium/jingle/notifier/listener/notification_defines.h b/chromium/jingle/notifier/listener/notification_defines.h
index 5d4a0c83dc1..09d7e668587 100644
--- a/chromium/jingle/notifier/listener/notification_defines.h
+++ b/chromium/jingle/notifier/listener/notification_defines.h
@@ -47,6 +47,7 @@ bool RecipientListsEqual(const RecipientList& recipients1,
 
 struct Notification {
   Notification();
+  Notification(const Notification& other);
   ~Notification();
 
   // The channel the notification is coming in on.