From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- .../navigation_metrics/navigation_metrics.cc | 27 +++++++++++++++------- .../navigation_metrics/navigation_metrics.h | 9 ++++++++ .../navigation_metrics_unittest.cc | 10 -------- 3 files changed, 28 insertions(+), 18 deletions(-) (limited to 'chromium/components/navigation_metrics') diff --git a/chromium/components/navigation_metrics/navigation_metrics.cc b/chromium/components/navigation_metrics/navigation_metrics.cc index cdc147cfb6a..f814e71ef06 100644 --- a/chromium/components/navigation_metrics/navigation_metrics.cc +++ b/chromium/components/navigation_metrics/navigation_metrics.cc @@ -15,6 +15,17 @@ namespace navigation_metrics { +const char kMainFrameScheme[] = "Navigation.MainFrameScheme2"; +const char kMainFrameSchemeDifferentPage[] = + "Navigation.MainFrameSchemeDifferentPage2"; +const char kMainFrameSchemeOTR[] = "Navigation.MainFrameSchemeOTR2"; +const char kMainFrameSchemeDifferentPageOTR[] = + "Navigation.MainFrameSchemeDifferentPageOTR2"; +const char kMainFrameHasRTLDomain[] = "Navigation.MainFrameHasRTLDomain2"; +const char kMainFrameHasRTLDomainDifferentPage[] = + "Navigation.MainFrameHasRTLDomainDifferentPage2"; +const char kMainFrameProfileType[] = "Navigation.MainFrameProfileType2"; + namespace { const char* const kSchemeNames[] = { @@ -58,29 +69,29 @@ void RecordMainFrameNavigation( bool is_off_the_record, profile_metrics::BrowserProfileType profile_type) { Scheme scheme = GetScheme(url); - UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameScheme", scheme, + UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameScheme2", scheme, Scheme::COUNT); if (!is_same_document) { - UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeDifferentPage", scheme, - Scheme::COUNT); - UMA_HISTOGRAM_BOOLEAN("Navigation.MainFrameHasRTLDomainDifferentPage", + UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeDifferentPage2", + scheme, Scheme::COUNT); + UMA_HISTOGRAM_BOOLEAN("Navigation.MainFrameHasRTLDomainDifferentPage2", base::i18n::StringContainsStrongRTLChars( url_formatter::IDNToUnicode(url.host()))); } - UMA_HISTOGRAM_BOOLEAN("Navigation.MainFrameHasRTLDomain", + UMA_HISTOGRAM_BOOLEAN("Navigation.MainFrameHasRTLDomain2", base::i18n::StringContainsStrongRTLChars( url_formatter::IDNToUnicode(url.host()))); if (is_off_the_record) { - UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeOTR", scheme, + UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeOTR2", scheme, Scheme::COUNT); if (!is_same_document) { - UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeDifferentPageOTR", + UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameSchemeDifferentPageOTR2", scheme, Scheme::COUNT); } } - UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameProfileType", profile_type); + UMA_HISTOGRAM_ENUMERATION("Navigation.MainFrameProfileType2", profile_type); } void RecordOmniboxURLNavigation(const GURL& url) { diff --git a/chromium/components/navigation_metrics/navigation_metrics.h b/chromium/components/navigation_metrics/navigation_metrics.h index a55887a3b0f..d0e2c28f82d 100644 --- a/chromium/components/navigation_metrics/navigation_metrics.h +++ b/chromium/components/navigation_metrics/navigation_metrics.h @@ -13,6 +13,15 @@ enum class BrowserProfileType; namespace navigation_metrics { +// Names of the metrics logged by RecordMainFrameNavigation() function. +extern const char kMainFrameScheme[]; +extern const char kMainFrameSchemeDifferentPage[]; +extern const char kMainFrameSchemeOTR[]; +extern const char kMainFrameSchemeDifferentPageOTR[]; +extern const char kMainFrameHasRTLDomain[]; +extern const char kMainFrameHasRTLDomainDifferentPage[]; +extern const char kMainFrameProfileType[]; + // A Scheme is an C++ enum type loggable in UMA for a histogram of UMA enum type // NavigationScheme. // diff --git a/chromium/components/navigation_metrics/navigation_metrics_unittest.cc b/chromium/components/navigation_metrics/navigation_metrics_unittest.cc index c4a60ad9066..36874a1a1cb 100644 --- a/chromium/components/navigation_metrics/navigation_metrics_unittest.cc +++ b/chromium/components/navigation_metrics/navigation_metrics_unittest.cc @@ -13,16 +13,6 @@ namespace { const char* const kTestUrl = "http://www.example.com"; // http://ab.גדהוזח.ij/kl/mn/op.html in A-label form. constexpr char kRtlUrl[] = "http://ab.xn--6dbcdefg.ij/kl/mn/op.html"; -const char* const kMainFrameScheme = "Navigation.MainFrameScheme"; -const char* const kMainFrameSchemeDifferentPage = - "Navigation.MainFrameSchemeDifferentPage"; -const char* const kMainFrameSchemeOTR = "Navigation.MainFrameSchemeOTR"; -const char* const kMainFrameSchemeDifferentPageOTR = - "Navigation.MainFrameSchemeDifferentPageOTR"; -constexpr char kMainFrameHasRTLDomain[] = "Navigation.MainFrameHasRTLDomain"; -constexpr char kMainFrameHasRTLDomainDifferentPage[] = - "Navigation.MainFrameHasRTLDomainDifferentPage"; -constexpr char kMainFrameProfileType[] = "Navigation.MainFrameProfileType"; } // namespace namespace navigation_metrics { -- cgit v1.2.1