BASELINE: Update Chromium to 62.0.3202.101

Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

5 files changed, 16 insertions, 14 deletions

diff --git a/chromium/components/domain_reliability/context.h b/chromium/components/domain_reliability/context.h
index da4a2448df3..aa77580e87e 100644
--- a/chromium/components/domain_reliability/context.h
+++ b/chromium/components/domain_reliability/context.h
@@ -7,10 +7,10 @@
 
 #include <stddef.h>
 
-#include <deque>
 #include <memory>
 #include <vector>
 
+#include "base/containers/circular_deque.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ -119,7 +119,7 @@ class DOMAIN_RELIABILITY_EXPORT DomainReliabilityContext {
   DomainReliabilityDispatcher* dispatcher_;
   DomainReliabilityUploader* uploader_;
 
-  std::deque<std::unique_ptr<DomainReliabilityBeacon>> beacons_;
+  base::circular_deque<std::unique_ptr<DomainReliabilityBeacon>> beacons_;
   size_t uploading_beacons_size_;
   base::TimeTicks upload_time_;
   base::TimeTicks last_upload_time_;
diff --git a/chromium/components/domain_reliability/google_configs.cc b/chromium/components/domain_reliability/google_configs.cc
index a28a0b6e0c8..e5959d9b1b8 100644
--- a/chromium/components/domain_reliability/google_configs.cc
+++ b/chromium/components/domain_reliability/google_configs.cc
@@ -524,19 +524,19 @@ const GoogleConfigParams kGoogleConfigs[] = {
     {"redirector.googlevideo.com", false, false, false},
 };
 
-const char* kGoogleStandardCollectors[] = {
-  "https://beacons.gcp.gvt2.com/domainreliability/upload",
-  "https://beacons.gvt2.com/domainreliability/upload",
-  "https://beacons2.gvt2.com/domainreliability/upload",
-  "https://beacons3.gvt2.com/domainreliability/upload",
-  "https://beacons4.gvt2.com/domainreliability/upload",
-  "https://beacons5.gvt2.com/domainreliability/upload",
-  "https://beacons5.gvt3.com/domainreliability/upload",
-  "https://clients2.google.com/domainreliability/upload",
+const char* const kGoogleStandardCollectors[] = {
+    "https://beacons.gcp.gvt2.com/domainreliability/upload",
+    "https://beacons.gvt2.com/domainreliability/upload",
+    "https://beacons2.gvt2.com/domainreliability/upload",
+    "https://beacons3.gvt2.com/domainreliability/upload",
+    "https://beacons4.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt2.com/domainreliability/upload",
+    "https://beacons5.gvt3.com/domainreliability/upload",
+    "https://clients2.google.com/domainreliability/upload",
 };
 
-const char* kGoogleOriginSpecificCollectorPathString =
-  "/domainreliability/upload";
+const char* const kGoogleOriginSpecificCollectorPathString =
+    "/domainreliability/upload";
 
 static std::unique_ptr<DomainReliabilityConfig> CreateGoogleConfig(
     const GoogleConfigParams& params,
diff --git a/chromium/components/domain_reliability/monitor.cc b/chromium/components/domain_reliability/monitor.cc
index b9b11530a80..68efc592540 100644
--- a/chromium/components/domain_reliability/monitor.cc
+++ b/chromium/components/domain_reliability/monitor.cc
@@ -134,6 +134,7 @@ void DomainReliabilityMonitor::MoveToNetworkThread() {
 
 void DomainReliabilityMonitor::InitURLRequestContext(
     net::URLRequestContext* url_request_context) {
+  DCHECK(url_request_context);
   DCHECK(OnNetworkThread());
   DCHECK(moved_to_network_thread_);
 
diff --git a/chromium/components/domain_reliability/uploader.cc b/chromium/components/domain_reliability/uploader.cc
index 92bea3c394d..8ab248127de 100644
--- a/chromium/components/domain_reliability/uploader.cc
+++ b/chromium/components/domain_reliability/uploader.cc
@@ -103,7 +103,7 @@ class DomainReliabilityUploaderImpl
             destination: GOOGLE_OWNED_SERVICE
           }
           policy {
-            cookies_allowed: false
+            cookies_allowed: NO
             setting:
               "Users can enable or disable Domain Reliability on desktop, via "
               "toggling 'Automatically send usage statistics and crash reports "
diff --git a/chromium/components/domain_reliability/util.cc b/chromium/components/domain_reliability/util.cc
index 9c4406fe9a4..8a9eb549dde 100644
--- a/chromium/components/domain_reliability/util.cc
+++ b/chromium/components/domain_reliability/util.cc
@@ -128,6 +128,7 @@ std::string GetDomainReliabilityProtocol(
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_38:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_39:
     case net::HttpResponseInfo::CONNECTION_INFO_QUIC_40:
+    case net::HttpResponseInfo::CONNECTION_INFO_QUIC_41:
       return "QUIC";
     case net::HttpResponseInfo::NUM_OF_CONNECTION_INFOS:
       NOTREACHED();