BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0

Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 26 insertions, 6 deletions

diff --git a/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
index ae7992c9fb4..40d2d1de0e9 100644
--- a/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
+++ b/chromium/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
@@ -19,10 +19,10 @@
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
-#include "net/dns/dns_protocol.h"
 #include "net/dns/dns_query.h"
 #include "net/dns/dns_response.h"
 #include "net/dns/dns_util.h"
+#include "net/dns/public/dns_protocol.h"
 
 namespace {
 
diff --git a/chromium/net/tools/dump_cache/dump_files.cc b/chromium/net/tools/dump_cache/dump_files.cc
index cb85057b523..0a8ec2835d4 100644
--- a/chromium/net/tools/dump_cache/dump_files.cc
+++ b/chromium/net/tools/dump_cache/dump_files.cc
@@ -296,7 +296,7 @@ bool CacheDumper::HexDump(disk_cache::CacheAddr addr, std::string* out) {
     return false;
 
   size_t size = address.num_blocks() * address.BlockSize();
-  std::unique_ptr<char> buffer(new char[size]);
+  std::unique_ptr<char[]> buffer(new char[size]);
 
   size_t offset = address.start_block() * address.BlockSize() +
                   disk_cache::kBlockHeaderSize;
diff --git a/chromium/net/tools/quic/quic_http_proxy_backend_stream_test.cc b/chromium/net/tools/quic/quic_http_proxy_backend_stream_test.cc
index ef2d507f484..9d966feea90 100644
--- a/chromium/net/tools/quic/quic_http_proxy_backend_stream_test.cc
+++ b/chromium/net/tools/quic/quic_http_proxy_backend_stream_test.cc
@@ -136,7 +136,6 @@ class TestQuicServerStreamDelegate
   bool send_success_;
   bool did_complete_;
   std::unique_ptr<QuicHttpProxyBackendStream> quic_backend_stream_;
-  base::test::ScopedTaskEnvironment scoped_task_environment;
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_ =
       base::ThreadTaskRunnerHandle::Get();
   base::RunLoop run_loop_;
@@ -185,6 +184,7 @@ class QuicHttpProxyBackendStreamTest : public QuicTest {
   }
 
  protected:
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
   std::string backend_url_;
   std::unique_ptr<QuicHttpProxyBackend> proxy_backend_;
   std::unique_ptr<QuicHttpProxyBackend> proxy_backend_fail_;
@@ -479,4 +479,4 @@ TEST_F(QuicHttpProxyBackendStreamTest, SendRequestToBackendHopHeaders) {
 }
 
 }  // namespace test
-}  // namespace net
\ No newline at end of file
+}  // namespace net
diff --git a/chromium/net/tools/testserver/run_testserver.cc b/chromium/net/tools/testserver/run_testserver.cc
index 378d5b09822..10ea873cbea 100644
--- a/chromium/net/tools/testserver/run_testserver.cc
+++ b/chromium/net/tools/testserver/run_testserver.cc
@@ -7,6 +7,7 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
diff --git a/chromium/net/tools/testserver/testserver.py b/chromium/net/tools/testserver/testserver.py
index 648082e7dad..ea1d9cd3908 100755
--- a/chromium/net/tools/testserver/testserver.py
+++ b/chromium/net/tools/testserver/testserver.py
@@ -161,7 +161,9 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
                npn_protocols, record_resume_info, tls_intolerant,
                tls_intolerance_type, signed_cert_timestamps,
                fallback_scsv_enabled, ocsp_response,
-               alert_after_handshake, disable_channel_id, disable_ems):
+               alert_after_handshake, disable_channel_id, disable_ems,
+               simulate_tls13_downgrade, simulate_tls12_downgrade,
+               tls_max_version):
     self.cert_chain = tlslite.api.X509CertChain()
     self.cert_chain.parsePemList(pem_cert_and_key)
     # Force using only python implementation - otherwise behavior is different
@@ -208,6 +210,12 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
       self.ssl_handshake_settings.enableChannelID = False
     if disable_ems:
       self.ssl_handshake_settings.enableExtendedMasterSecret = False
+    if simulate_tls13_downgrade:
+      self.ssl_handshake_settings.simulateTLS13Downgrade = True
+    if simulate_tls12_downgrade:
+      self.ssl_handshake_settings.simulateTLS12Downgrade = True
+    if tls_max_version != 0:
+      self.ssl_handshake_settings.maxVersion = (3, tls_max_version)
     self.ssl_handshake_settings.alpnProtos=alpn_protocols;
 
     if record_resume_info:
@@ -2078,7 +2086,10 @@ class ServerRunner(testserver_base.TestServerRunner):
                              stapled_ocsp_response,
                              self.options.alert_after_handshake,
                              self.options.disable_channel_id,
-                             self.options.disable_extended_master_secret)
+                             self.options.disable_extended_master_secret,
+                             self.options.simulate_tls13_downgrade,
+                             self.options.simulate_tls12_downgrade,
+                             self.options.tls_max_version)
         print 'HTTPS server started on https://%s:%d...' % \
             (host, server.server_port)
       else:
@@ -2378,6 +2389,14 @@ class ServerRunner(testserver_base.TestServerRunner):
     self.option_parser.add_option('--disable-channel-id', action='store_true')
     self.option_parser.add_option('--disable-extended-master-secret',
                                   action='store_true')
+    self.option_parser.add_option('--simulate-tls13-downgrade',
+                                  action='store_true')
+    self.option_parser.add_option('--simulate-tls12-downgrade',
+                                  action='store_true')
+    self.option_parser.add_option('--tls-max-version', default='0', type='int',
+                                  help='If non-zero, the maximum TLS version '
+                                  'to support. 1 means TLS 1.0, 2 means '
+                                  'TLS 1.1, and 3 means TLS 1.2.')
     self.option_parser.add_option('--redirect-connect-to-localhost',
                                   dest='redirect_connect_to_localhost',
                                   default=False, action='store_true',