Expire various expired PrintPreview histograms.

Many of these are long expired. - Deleted the entries from histograms.xml files. - Remove the code that generate these histograms. Bug: 1384767,1384936 Change-Id: I4ed067a45b513881146edfec78275260d1900c1a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4029053 Reviewed-by: Alan Screen <awscreen@chromium.org> Commit-Queue: Alan Screen <awscreen@chromium.org> Auto-Submit: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/main@{#1073671}
chromium · Nov 19, 2022 · 4117a21 · 4117a21
1 parent c249436
commit 4117a21
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 65 deletions.
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -665,9 +665,6 @@ void PrintPreviewHandler::HandleGetPreview(const base::Value::List& args) {
   settings.Set(kPreviewUIID,
                print_preview_ui()->GetIDForPrintPreviewUI().value());
 
-  // Increment request count.
-  ++regenerate_preview_request_count_;
-
   WebContents* initiator = GetInitiator();
   RenderFrameHost* rfh =
       initiator
@@ -710,8 +707,6 @@ void PrintPreviewHandler::HandleGetPreview(const base::Value::List& args) {
 }
 
 void PrintPreviewHandler::HandlePrint(const base::Value::List& args) {
-  ReportRegeneratePreviewRequestCountBeforePrint(
-      regenerate_preview_request_count_);
   CHECK(args[0].is_string());
   const std::string& callback_id = args[0].GetString();
   CHECK(!callback_id.empty());
@@ -807,9 +802,6 @@ void PrintPreviewHandler::HandleShowSystemDialog(
 void PrintPreviewHandler::HandleClosePreviewDialog(
     const base::Value::List& /*args*/) {
   ReportUserActionHistogram(UserActionBuckets::kCancel);
-
-  ReportRegeneratePreviewRequestCountBeforeCancel(
-      regenerate_preview_request_count_);
 }
 
 void PrintPreviewHandler::GetLocaleInformation(base::Value::Dict* settings) {

diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.h b/chrome/browser/ui/webui/print_preview/print_preview_handler.h
@@ -259,10 +259,6 @@ class PrintPreviewHandler : public content::WebUIMessageHandler {
   void OnPrintResult(const std::string& callback_id,
                      const base::Value& error);
 
-  // A count of how many requests received to regenerate preview data.
-  // Initialized to 0 then incremented and emitted to a histogram.
-  int regenerate_preview_request_count_ = 0;
-
   // Whether we have already logged a failed print preview.
   bool reported_failed_preview_ = false;
 

diff --git a/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc b/chrome/browser/ui/webui/print_preview/print_preview_metrics.cc
@@ -167,16 +167,6 @@ void ReportPrintSettingsStats(const base::Value::Dict& print_settings,
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 }
 
-void ReportRegeneratePreviewRequestCountBeforeCancel(size_t count) {
-  base::UmaHistogramCounts1M(
-      "PrintPreview.RegeneratePreviewRequest.BeforeCancel", count);
-}
-
-void ReportRegeneratePreviewRequestCountBeforePrint(size_t count) {
-  base::UmaHistogramCounts1M(
-      "PrintPreview.RegeneratePreviewRequest.BeforePrint", count);
-}
-
 void ReportUserActionHistogram(UserActionBuckets event) {
   // Use macro because this histogram is called multiple times in succession.
   UMA_HISTOGRAM_ENUMERATION("PrintPreview.UserAction", event);

diff --git a/chrome/browser/ui/webui/print_preview/print_preview_metrics.h b/chrome/browser/ui/webui/print_preview/print_preview_metrics.h
@@ -81,14 +81,6 @@ void ReportPrintSettingsStats(const base::Value::Dict& print_settings,
                               const base::Value::Dict& preview_settings,
                               bool is_pdf);
 
-// Record the number of times the user requests to regenerate preview data
-// before cancelling.
-void ReportRegeneratePreviewRequestCountBeforeCancel(size_t count);
-
-// Record the number of times the user requests to regenerate preview data
-// before printing.
-void ReportRegeneratePreviewRequestCountBeforePrint(size_t count);
-
 void ReportUserActionHistogram(UserActionBuckets event);
 
 }  // namespace printing

diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
@@ -2290,22 +2290,17 @@ bool PrintRenderFrameHelper::PrintPagesNative(
     blink::WebLocalFrame* frame,
     uint32_t page_count,
     const std::vector<uint32_t>& printed_pages) {
+  DCHECK(!printed_pages.empty());
+
   const mojom::PrintPagesParams& params = *print_pages_params_;
   const mojom::PrintParams& print_params = *params.params;
 
-  DCHECK(!printed_pages.empty());
-  if (print_params.preview_ui_id < 0) {
-    // Printing for system dialog.
-    base::UmaHistogramCounts1M("PrintPreview.PageCount.SystemDialog",
-                               printed_pages.size());
-  }
-
-  ContentProxySet typeface_content_info;
   MetafileSkia metafile(print_params.printed_doc_type,
                         print_params.document_cookie);
   CHECK(metafile.Init());
 
   // Provide a typeface context to use with serializing to the print compositor.
+  ContentProxySet typeface_content_info;
   metafile.UtilizeTypefaceContext(&typeface_content_info);
 
   // If tagged PDF exporting is enabled, we also need to capture an
@@ -2968,7 +2963,6 @@ void PrintRenderFrameHelper::PrintPreviewContext::RenderedPreviewPage(
     const base::TimeDelta& page_time) {
   DCHECK_EQ(RENDERING, state_);
   document_render_time_ += page_time;
-  base::UmaHistogramTimes("PrintPreview.RenderPDFPageTime", page_time);
 }
 
 void PrintRenderFrameHelper::PrintPreviewContext::RenderedPreviewDocument(

diff --git a/tools/metrics/histograms/metadata/print/histograms.xml b/tools/metrics/histograms/metadata/print/histograms.xml
@@ -142,15 +142,6 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
-<histogram name="PrintPreview.RegeneratePreviewRequest.BeforeCancel"
-    units="units" expires_after="M77">
-  <owner>thestig@chromium.org</owner>
-  <summary>
-    The number of times regenerate preview requests received before the user
-    clicked the cancel button.
-  </summary>
-</histogram>
-
 <histogram name="PrintPreview.RegeneratePreviewRequest.BeforeFirstData"
     units="units" expires_after="2020-02-23">
   <owner>thestig@chromium.org</owner>
@@ -160,16 +151,6 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
-<histogram name="PrintPreview.RegeneratePreviewRequest.BeforePrint"
-    units="units" expires_after="2021-05-10">
-  <owner>thestig@chromium.org</owner>
-  <owner>dhoss@chromium.org</owner>
-  <summary>
-    The number of times regenerate preview requests received before the user
-    clicked the print button.
-  </summary>
-</histogram>
-
 <histogram name="PrintPreview.RenderAndGeneratePDFTime" units="ms"
     expires_after="never">
 <!-- expires-never: Monitors printing system health. -->
@@ -205,13 +186,6 @@ chromium-metrics-reviews@google.com.
   </summary>
 </histogram>
 
-<histogram name="PrintPreview.RenderPDFPageTime" units="ms"
-    expires_after="2021-05-10">
-  <owner>thestig@chromium.org</owner>
-  <owner>awscreen@chromium.org</owner>
-  <summary>Time taken to render each PDF page for print preview.</summary>
-</histogram>
-
 <histogram name="PrintPreview.RenderToPDFTime" units="ms"
     expires_after="2023-03-19">
   <owner>thestig@chromium.org</owner>