Rename all PrefetchProxy histograms to be PrefetchProxy* prefixed

Also bumps the expiration of all the histograms to June 2021. No other
behavioral changes.

Bug: 1165072, 1165073
Change-Id: I7c78f6a9220167c050fb6aa50990ad92699b13a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2630830Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Robert Ogden <robertogden@chromium.org>
Cr-Commit-Position: refs/heads/master@{#846317}

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc

@@ -1019,8 +1019,7 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyBrowserTest,
   MakeNavigationPrediction(doc_url, {error_url});
   run_loop.Run();
 
-  histogram_tester.ExpectUniqueSample("IsolatedPrerender.Proxy.RespCode", 400,
-                                      1);
+  histogram_tester.ExpectUniqueSample("PrefetchProxy.Proxy.RespCode", 400, 1);
   EXPECT_EQ(1U, tab_helper->srp_metrics().predicted_urls_count_);
   EXPECT_EQ(1U, tab_helper->srp_metrics().prefetch_attempted_count_);
   EXPECT_EQ(0U, tab_helper->srp_metrics().prefetch_successful_count_);
@@ -1299,14 +1298,14 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyBrowserTest,
   // successfully done and processed.
   run_loop.Run();
 
+  histogram_tester.ExpectTotalCount("PrefetchProxy.Prefetch.Mainframe.RespCode",
+                                    3);
   histogram_tester.ExpectTotalCount(
-      "IsolatedPrerender.Prefetch.Mainframe.RespCode", 3);
+      "PrefetchProxy.Prefetch.Mainframe.BodyLength", 3);
   histogram_tester.ExpectTotalCount(
-      "IsolatedPrerender.Prefetch.Mainframe.BodyLength", 3);
+      "PrefetchProxy.Prefetch.Mainframe.TotalTime", 3);
   histogram_tester.ExpectTotalCount(
-      "IsolatedPrerender.Prefetch.Mainframe.TotalTime", 3);
-  histogram_tester.ExpectTotalCount(
-      "IsolatedPrerender.Prefetch.Mainframe.ConnectTime", 3);
+      "PrefetchProxy.Prefetch.Mainframe.ConnectTime", 3);
 
   // Navigate to a prefetched page to trigger UKM recording.
   ui_test_utils::NavigateToURL(browser(), eligible_link_2);
@@ -1485,7 +1484,7 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyBrowserTest,
     run_loop.Run();
 
     histogram_tester.ExpectUniqueSample(
-        "IsolatedPrerender.Prefetch.Mainframe.RespCode",
+        "PrefetchProxy.Prefetch.Mainframe.RespCode",
         net::HTTP_SERVICE_UNAVAILABLE, 1);
     EXPECT_EQ(1U, tab_helper->srp_metrics().predicted_urls_count_);
     EXPECT_EQ(1U, tab_helper->srp_metrics().prefetch_attempted_count_);
@@ -1562,7 +1561,7 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyBrowserTest,
   run_loop.Run();
 
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Prefetch.Mainframe.RespCode", 204, 1);
+      "PrefetchProxy.Prefetch.Mainframe.RespCode", 204, 1);
 
   // Navigate to a prefetched page to trigger UKM recording. Note that because
   // the navigation is never committed, the UKM recording happens immediately.
@@ -1949,9 +1948,9 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyBrowserTest,
   EXPECT_TRUE(inspected_image_request);
 
   histogram_tester.ExpectTotalCount(
-      "IsolatedPrerender.AfterClick.Mainframe.CookieWaitTime", 1);
+      "PrefetchProxy.AfterClick.Mainframe.CookieWaitTime", 1);
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Prefetch.Mainframe.CookiesToCopy", 1, 1);
+      "PrefetchProxy.Prefetch.Mainframe.CookiesToCopy", 1, 1);
 
   // The cookie from prefetch should also be present in the CookieManager API.
   EXPECT_EQ("type=ChocolateChip",
@@ -2849,9 +2848,9 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyWithNSPBrowserTest,
                 net::CookieOptions::SameSiteCookieContext::MakeInclusive()));
 
   histogram_tester.ExpectTotalCount(
-      "IsolatedPrerender.AfterClick.Mainframe.CookieWaitTime", 1);
+      "PrefetchProxy.AfterClick.Mainframe.CookieWaitTime", 1);
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Prefetch.Mainframe.CookiesToCopy", 1, 1);
+      "PrefetchProxy.Prefetch.Mainframe.CookiesToCopy", 1, 1);
 
   // Check that the JavaScript ran.
   EXPECT_EQ(base::ASCIIToUTF16("JavaScript Executed"),
@@ -2869,13 +2868,13 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyWithNSPBrowserTest,
                              kSRPClickPrefetchStatusName));
 
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Prefetch.Subresources.NetError", net::OK, 2);
+      "PrefetchProxy.Prefetch.Subresources.NetError", net::OK, 2);
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Prefetch.Subresources.Quantity", 4, 1);
+      "PrefetchProxy.Prefetch.Subresources.Quantity", 4, 1);
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Prefetch.Subresources.RespCode", 200, 2);
+      "PrefetchProxy.Prefetch.Subresources.RespCode", 200, 2);
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.AfterClick.Subresources.UsedCache", true, 2);
+      "PrefetchProxy.AfterClick.Subresources.UsedCache", true, 2);
 }
 
 IN_PROC_BROWSER_TEST_F(PrefetchProxyWithNSPBrowserTest,
@@ -2919,7 +2918,7 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyWithNSPBrowserTest,
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
 
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.SpareRenderer.CountStartedOnSRP", 1, 1);
+      "PrefetchProxy.SpareRenderer.CountStartedOnSRP", 1, 1);
 }
 
 namespace {
@@ -3371,7 +3370,7 @@ IN_PROC_BROWSER_TEST_F(PrefetchProxyWithNSPBrowserTest,
 
   // Checks that only one resource was used from cache.
   histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.AfterClick.Subresources.UsedCache", true, 1);
+      "PrefetchProxy.AfterClick.Subresources.UsedCache", true, 1);
 
   // Navigate again to trigger UKM recording.
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_decider.cc

@@ -63,7 +63,7 @@ void PrefetchProxyOriginDecider::ReportOriginRetryAfter(
     return;
   }
 
-  UMA_HISTOGRAM_CUSTOM_TIMES("IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+  UMA_HISTOGRAM_CUSTOM_TIMES("PrefetchProxy.Prefetch.Mainframe.RetryAfter",
                              retry_after, base::TimeDelta::FromSeconds(1),
                              base::TimeDelta::FromDays(7), 100);
 

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_decider_unittest.cc

@@ -57,7 +57,7 @@ TEST_F(PrefetchProxyOriginDeciderTest, MaxCap) {
   decider->ReportOriginRetryAfter(url, base::TimeDelta::FromSeconds(15));
   EXPECT_FALSE(decider->IsOriginOutsideRetryAfterWindow(url));
   histogram_tester()->ExpectUniqueTimeSample(
-      "IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+      "PrefetchProxy.Prefetch.Mainframe.RetryAfter",
       base::TimeDelta::FromSeconds(15), 1);
 
   clock()->Advance(base::TimeDelta::FromSeconds(11));
@@ -71,7 +71,7 @@ TEST_F(PrefetchProxyOriginDeciderTest, WaitsForDelta) {
 
   decider->ReportOriginRetryAfter(url, base::TimeDelta::FromSeconds(15));
   histogram_tester()->ExpectUniqueTimeSample(
-      "IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+      "PrefetchProxy.Prefetch.Mainframe.RetryAfter",
       base::TimeDelta::FromSeconds(15), 1);
 
   for (size_t i = 0; i <= 15; i++) {
@@ -88,7 +88,7 @@ TEST_F(PrefetchProxyOriginDeciderTest, ByOrigin) {
   decider->ReportOriginRetryAfter(GURL("http://foo.com"),
                                   base::TimeDelta::FromSeconds(1));
   histogram_tester()->ExpectUniqueTimeSample(
-      "IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+      "PrefetchProxy.Prefetch.Mainframe.RetryAfter",
       base::TimeDelta::FromSeconds(1), 1);
 
   // Any url for the origin should be ineligible.
@@ -119,7 +119,7 @@ TEST_F(PrefetchProxyOriginDeciderTest, Clear) {
 
   decider->ReportOriginRetryAfter(url, base::TimeDelta::FromSeconds(1));
   histogram_tester()->ExpectUniqueTimeSample(
-      "IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+      "PrefetchProxy.Prefetch.Mainframe.RetryAfter",
       base::TimeDelta::FromSeconds(1), 1);
   EXPECT_FALSE(decider->IsOriginOutsideRetryAfterWindow(url));
 
@@ -136,13 +136,13 @@ TEST_F(PrefetchProxyOriginDeciderTest, PersistentPrefs) {
     decider->ReportOriginRetryAfter(GURL("http://foo.com"),
                                     base::TimeDelta::FromSeconds(3));
     histogram_tester()->ExpectTimeBucketCount(
-        "IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+        "PrefetchProxy.Prefetch.Mainframe.RetryAfter",
         base::TimeDelta::FromSeconds(1), 1);
     histogram_tester()->ExpectTimeBucketCount(
-        "IsolatedPrerender.Prefetch.Mainframe.RetryAfter",
+        "PrefetchProxy.Prefetch.Mainframe.RetryAfter",
         base::TimeDelta::FromSeconds(3), 1);
     histogram_tester()->ExpectTotalCount(
-        "IsolatedPrerender.Prefetch.Mainframe.RetryAfter", 2);
+        "PrefetchProxy.Prefetch.Mainframe.RetryAfter", 2);
   }
 
   clock()->Advance(base::TimeDelta::FromSeconds(2));

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxy_configurator.cc

@@ -90,7 +90,7 @@ void PrefetchProxyProxyConfigurator::OnFallback(
     return;
   }
 
-  base::UmaHistogramSparse("IsolatedPrerender.Proxy.Fallback.NetError",
+  base::UmaHistogramSparse("PrefetchProxy.Proxy.Fallback.NetError",
                            std::abs(net_error));
 
   OnTunnelProxyConnectionError(base::nullopt);
@@ -105,7 +105,7 @@ void PrefetchProxyProxyConfigurator::OnTunnelHeadersReceived(
     return;
   }
 
-  base::UmaHistogramSparse("IsolatedPrerender.Proxy.RespCode",
+  base::UmaHistogramSparse("PrefetchProxy.Proxy.RespCode",
                            response_headers->response_code());
 
   if (response_headers->response_code() == net::HTTP_OK) {

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxy_configurator_unittest.cc

@@ -142,9 +142,8 @@ TEST_F(PrefetchProxyProxyConfiguratorTest,
 
   configurator()->OnFallback(proxy, net::ERR_FAILED);
   EXPECT_FALSE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Proxy.Fallback.NetError", std::abs(net::ERR_FAILED),
-      1);
+  histogram_tester.ExpectUniqueSample("PrefetchProxy.Proxy.Fallback.NetError",
+                                      std::abs(net::ERR_FAILED), 1);
 
   FastForwardBy(base::TimeDelta::FromSeconds(5 * 60 + 1));
 
@@ -166,8 +165,8 @@ TEST_F(PrefetchProxyProxyConfiguratorTest, FallbackDoesRandomBackoff_ErrOK) {
 
   configurator()->OnFallback(proxy, net::OK);
   EXPECT_FALSE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectUniqueSample(
-      "IsolatedPrerender.Proxy.Fallback.NetError", net::OK, 1);
+  histogram_tester.ExpectUniqueSample("PrefetchProxy.Proxy.Fallback.NetError",
+                                      net::OK, 1);
 
   FastForwardBy(base::TimeDelta::FromSeconds(5 * 60 + 1));
 
@@ -189,8 +188,7 @@ TEST_F(PrefetchProxyProxyConfiguratorTest, Fallback_DifferentProxy) {
 
   configurator()->OnFallback(proxy, net::OK);
   EXPECT_TRUE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectTotalCount("IsolatedPrerender.Proxy.Fallback.NetError",
-                                    0);
+  histogram_tester.ExpectTotalCount("PrefetchProxy.Proxy.Fallback.NetError", 0);
 }
 
 TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_200OK) {
@@ -209,8 +207,7 @@ TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_200OK) {
   configurator()->OnTunnelHeadersReceived(
       proxy, base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/1.1 200 OK"));
   EXPECT_TRUE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectUniqueSample("IsolatedPrerender.Proxy.RespCode", 200,
-                                      1);
+  histogram_tester.ExpectUniqueSample("PrefetchProxy.Proxy.RespCode", 200, 1);
 }
 
 TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_DifferentProxy) {
@@ -229,7 +226,7 @@ TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_DifferentProxy) {
   configurator()->OnTunnelHeadersReceived(
       proxy, base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/1.1 200 OK"));
   EXPECT_TRUE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectTotalCount("IsolatedPrerender.Proxy.RespCode", 0);
+  histogram_tester.ExpectTotalCount("PrefetchProxy.Proxy.RespCode", 0);
 }
 
 TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_500NoRetryAfter) {
@@ -249,8 +246,7 @@ TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_500NoRetryAfter) {
       proxy, base::MakeRefCounted<net::HttpResponseHeaders>(
                  "HTTP/1.1 500 Internal Server Error"));
   EXPECT_FALSE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectUniqueSample("IsolatedPrerender.Proxy.RespCode", 500,
-                                      1);
+  histogram_tester.ExpectUniqueSample("PrefetchProxy.Proxy.RespCode", 500, 1);
 
   FastForwardBy(base::TimeDelta::FromSeconds(5 * 60 + 1));
   EXPECT_TRUE(configurator()->IsPrefetchProxyAvailable());
@@ -275,8 +271,7 @@ TEST_F(PrefetchProxyProxyConfiguratorTest, TunnelHeaders_500WithRetryAfter) {
           net::HttpResponseHeaders>(net::HttpUtil::AssembleRawHeaders(
           "HTTP/1.1 500 Internal Server Error\r\nRetry-After: 120\r\n\r\n")));
   EXPECT_FALSE(configurator()->IsPrefetchProxyAvailable());
-  histogram_tester.ExpectUniqueSample("IsolatedPrerender.Proxy.RespCode", 500,
-                                      1);
+  histogram_tester.ExpectUniqueSample("PrefetchProxy.Proxy.RespCode", 500, 1);
 
   FastForwardBy(base::TimeDelta::FromSeconds(119));
   EXPECT_FALSE(configurator()->IsPrefetchProxyAvailable());

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.cc

@@ -513,10 +513,10 @@ void PrefetchProxyProxyingURLLoaderFactory::
         const GURL& url,
         network::mojom::URLResponseHeadPtr head,
         const network::URLLoaderCompletionStatus& status) {
-  base::UmaHistogramSparse("IsolatedPrerender.Prefetch.Subresources.NetError",
+  base::UmaHistogramSparse("PrefetchProxy.Prefetch.Subresources.NetError",
                            std::abs(status.error_code));
   if (head && head->headers) {
-    base::UmaHistogramSparse("IsolatedPrerender.Prefetch.Subresources.RespCode",
+    base::UmaHistogramSparse("PrefetchProxy.Prefetch.Subresources.RespCode",
                              head->headers->response_code());
   }
 
@@ -527,7 +527,7 @@ void PrefetchProxyProxyingURLLoaderFactory::RecordSubresourceMetricsAfterClick(
     const GURL& url,
     network::mojom::URLResponseHeadPtr head,
     const network::URLLoaderCompletionStatus& status) {
-  UMA_HISTOGRAM_BOOLEAN("IsolatedPrerender.AfterClick.Subresources.UsedCache",
+  UMA_HISTOGRAM_BOOLEAN("PrefetchProxy.AfterClick.Subresources.UsedCache",
                         status.exists_in_cache);
   metrics_observer_->OnResourceUsedFromCache(url);
 }

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_subresource_manager.cc

@@ -22,7 +22,7 @@ PrefetchProxySubresourceManager::~PrefetchProxySubresourceManager() {
     nsp_handle_->SetObserver(nullptr);
     nsp_handle_->OnCancel();
   }
-  UMA_HISTOGRAM_COUNTS_100("IsolatedPrerender.Prefetch.Subresources.Quantity",
+  UMA_HISTOGRAM_COUNTS_100("PrefetchProxy.Prefetch.Subresources.Quantity",
                            successfully_loaded_subresources_.size());
 }
 

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc

@@ -190,9 +190,8 @@ PrefetchProxyTabHelper::CurrentPageLoad::CurrentPageLoad(
 
 PrefetchProxyTabHelper::CurrentPageLoad::~CurrentPageLoad() {
   if (PrefetchProxyStartsSpareRenderer()) {
-    UMA_HISTOGRAM_COUNTS_100(
-        "IsolatedPrerender.SpareRenderer.CountStartedOnSRP",
-        number_of_spare_renderers_started_);
+    UMA_HISTOGRAM_COUNTS_100("PrefetchProxy.SpareRenderer.CountStartedOnSRP",
+                             number_of_spare_renderers_started_);
   }
 
   if (!profile_)
@@ -327,7 +326,7 @@ void PrefetchProxyTabHelper::DidStartNavigation(
 
   if (page_->srp_metrics_->prefetch_attempted_count_ > 0) {
     UMA_HISTOGRAM_COUNTS_100(
-        "IsolatedPrerender.Prefetch.Mainframe.TotalRedirects",
+        "PrefetchProxy.Prefetch.Mainframe.TotalRedirects",
         page_->srp_metrics_->prefetch_total_redirect_count_);
   }
 
@@ -803,7 +802,7 @@ void PrefetchProxyTabHelper::OnPrefetchComplete(
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(PrefetchingActive());
 
-  base::UmaHistogramSparse("IsolatedPrerender.Prefetch.Mainframe.NetError",
+  base::UmaHistogramSparse("PrefetchProxy.Prefetch.Mainframe.NetError",
                            std::abs(loader->NetError()));
 
   if (loader->CompletionStatus()) {
@@ -848,12 +847,12 @@ void PrefetchProxyTabHelper::HandlePrefetchResponse(
   if (!head->headers)
     return;
 
-  UMA_HISTOGRAM_COUNTS_10M("IsolatedPrerender.Prefetch.Mainframe.BodyLength",
+  UMA_HISTOGRAM_COUNTS_10M("PrefetchProxy.Prefetch.Mainframe.BodyLength",
                            body->size());
 
   base::Optional<base::TimeDelta> total_time = GetTotalPrefetchTime(head.get());
   if (total_time) {
-    UMA_HISTOGRAM_CUSTOM_TIMES("IsolatedPrerender.Prefetch.Mainframe.TotalTime",
+    UMA_HISTOGRAM_CUSTOM_TIMES("PrefetchProxy.Prefetch.Mainframe.TotalTime",
                                *total_time,
                                base::TimeDelta::FromMilliseconds(10),
                                base::TimeDelta::FromSeconds(30), 100);
@@ -862,13 +861,13 @@ void PrefetchProxyTabHelper::HandlePrefetchResponse(
   base::Optional<base::TimeDelta> connect_time =
       GetPrefetchConnectTime(head.get());
   if (connect_time) {
-    UMA_HISTOGRAM_TIMES("IsolatedPrerender.Prefetch.Mainframe.ConnectTime",
+    UMA_HISTOGRAM_TIMES("PrefetchProxy.Prefetch.Mainframe.ConnectTime",
                         *connect_time);
   }
 
   int response_code = head->headers->response_code();
 
-  base::UmaHistogramSparse("IsolatedPrerender.Prefetch.Mainframe.RespCode",
+  base::UmaHistogramSparse("PrefetchProxy.Prefetch.Mainframe.RespCode",
                            response_code);
 
   if (response_code < 200 || response_code >= 300) {
@@ -1343,7 +1342,7 @@ void PrefetchProxyTabHelper::OnGotIsolatedCookiesToCopyAfterSRPClick(
     const net::CookieAccessResultList& excluded_cookies) {
   DCHECK(IsWaitingForAfterSRPCookiesCopy());
 
-  UMA_HISTOGRAM_COUNTS_100("IsolatedPrerender.Prefetch.Mainframe.CookiesToCopy",
+  UMA_HISTOGRAM_COUNTS_100("PrefetchProxy.Prefetch.Mainframe.CookiesToCopy",
                            cookie_list.size());
 
   if (cookie_list.empty()) {

chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.cc

@@ -68,7 +68,7 @@ void ReportProbeResult(int frame_tree_node_id,
 
 void RecordCookieWaitTime(base::TimeDelta wait_time) {
   UMA_HISTOGRAM_CUSTOM_TIMES(
-      "IsolatedPrerender.AfterClick.Mainframe.CookieWaitTime", wait_time,
+      "PrefetchProxy.AfterClick.Mainframe.CookieWaitTime", wait_time,
       base::TimeDelta(), base::TimeDelta::FromSeconds(5), 50);
 }