BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

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

3 files changed, 61 insertions, 1 deletions

diff --git a/chromium/components/ui_metrics/BUILD.gn b/chromium/components/ui_metrics/BUILD.gn
index 941ed1c5eef..71f721e3c88 100644
--- a/chromium/components/ui_metrics/BUILD.gn
+++ b/chromium/components/ui_metrics/BUILD.gn
@@ -2,8 +2,23 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+if (is_android) {
+  import("//build/config/android/config.gni")
+  import("//build/config/android/rules.gni")
+}
+
 source_set("ui_metrics") {
   sources = [
+    "canonical_url_share_metrics_types.h",
     "sadtab_metrics_types.h",
   ]
 }
+
+if (is_android) {
+  java_cpp_enum("ui_metrics_enums_java") {
+    sources = [
+      "canonical_url_share_metrics_types.h",
+      "sadtab_metrics_types.h",
+    ]
+  }
+}
diff --git a/chromium/components/ui_metrics/canonical_url_share_metrics_types.h b/chromium/components/ui_metrics/canonical_url_share_metrics_types.h
new file mode 100644
index 00000000000..bb866fcb660
--- /dev/null
+++ b/chromium/components/ui_metrics/canonical_url_share_metrics_types.h
@@ -0,0 +1,45 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_UI_METRICS_CANONICAL_URL_SHARE_METRICS_TYPES_H_
+#define COMPONENTS_UI_METRICS_CANONICAL_URL_SHARE_METRICS_TYPES_H_
+
+namespace ui_metrics {
+// The histogram key to report the result of the Canonical URL retrieval.
+const char kCanonicalURLResultHistogram[] = "Mobile.CanonicalURLResult";
+
+// Used to report the result of the retrieval of the Canonical URL.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.ui_metrics
+enum CanonicalURLResult {
+  // The canonical URL retrieval failed because the visible URL is not HTTPS.
+  FAILED_VISIBLE_URL_NOT_HTTPS = 0,
+
+  // Deprecated.
+  FAILED_CANONICAL_URL_NOT_HTTPS_DEPRECATED,
+
+  // The canonical URL retrieval failed because the page did not define one.
+  FAILED_NO_CANONICAL_URL_DEFINED,
+
+  // The canonical URL retrieval failed because the page's canonical URL was
+  // invalid.
+  FAILED_CANONICAL_URL_INVALID,
+
+  // The canonical URL retrieval succeeded. The retrieved canonical URL is
+  // different from the visible URL.
+  SUCCESS_CANONICAL_URL_DIFFERENT_FROM_VISIBLE,
+
+  // The canonical URL retrieval succeeded. The retrieved canonical URL is the
+  // same as the visible URL.
+  SUCCESS_CANONICAL_URL_SAME_AS_VISIBLE,
+
+  // The canonical URL retrieval succeeded. The canonical URL is not HTTPS
+  // (but the visible URL is).
+  SUCCESS_CANONICAL_URL_NOT_HTTPS,
+
+  // The count of canonical URL results. This must be the last item in the enum.
+  CANONICAL_URL_RESULT_COUNT
+};
+}  // namespace ui_metrics
+
+#endif  // COMPONENTS_UI_METRICS_CANONICAL_URL_SHARE_METRICS_TYPES_H_
diff --git a/chromium/components/ui_metrics/sadtab_metrics_types.h b/chromium/components/ui_metrics/sadtab_metrics_types.h
index 056541aecd6..965764cc67a 100644
--- a/chromium/components/ui_metrics/sadtab_metrics_types.h
+++ b/chromium/components/ui_metrics/sadtab_metrics_types.h
@@ -7,7 +7,7 @@
 
 namespace ui_metrics {
 // An enum for reporting interaction events to a UMA histogram.
-// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.tab
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.components.ui_metrics
 enum class SadTabEvent {
   // Records that the Sad Tab was displayed.
   DISPLAYED = 0,