Cleaned up the print preview API used by app printing browser tests

chrome/browser/ui/webui/print_preview/print_preview_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 
 #include <map>
 
 #include "base/id_map.h"
 #include "base/lazy_instance.h"
@@ skipping 320 matching lines @@
   source->AddResourcePath("images/pdf.png", IDR_PRINT_PREVIEW_IMAGES_PDF);
   source->AddResourcePath("images/mobile.png", IDR_PRINT_PREVIEW_IMAGES_MOBILE);
   source->AddResourcePath("images/mobile_shared.png",
                           IDR_PRINT_PREVIEW_IMAGES_MOBILE_SHARED);
   source->SetDefaultResource(IDR_PRINT_PREVIEW_HTML);
   source->SetRequestFilter(base::Bind(&HandleRequestCallback));
   source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';");
   return source;
 }
 
+int g_auto_cancel_count_for_testing_ = -1;  // Disabled if count < 0.
+
+void EnableAutoCancelAndResetCountForTesting() {
+  g_auto_cancel_count_for_testing_ = 0;
+}
+
+void DisableAutoCancelForTesting() {
+  g_auto_cancel_count_for_testing_ = -1;
+}
+
+bool IsAutoCancelEnabledForTesting() {
+  return (g_auto_cancel_count_for_testing_ >= 0);
+}
+
+void IncrementAutoCancelCountForTesting() {
+  if (g_auto_cancel_count_for_testing_ >= 0)
+    ++g_auto_cancel_count_for_testing_;
+}
+
+int GetAutoCancelCountForTesting() {
+  return std::max(g_auto_cancel_count_for_testing_, -1);
+}
+
 }  // namespace
 
 PrintPreviewUI::PrintPreviewUI(content::WebUI* web_ui)
     : ConstrainedWebDialogUI(web_ui),
       initial_preview_start_time_(base::TimeTicks::Now()),
       id_(g_print_preview_ui_id_map.Get().Add(this)),
       handler_(NULL),
       source_is_modifiable_(true),
       source_has_selection_(false),
       dialog_closed_(false) {
@@ skipping 162 matching lines @@
 
   if (!initial_preview_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("PrintPreview.InitialDisplayTime",
                         base::TimeTicks::Now() - initial_preview_start_time_);
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.Initial",
                          expected_pages_count);
     initial_preview_start_time_ = base::TimeTicks();
   }
   base::FundamentalValue ui_identifier(id_);
   base::FundamentalValue ui_preview_request_id(preview_request_id);
-  if (ScopedAutoCancelForTesting::IsEnabledForTesting()) {
-    ScopedAutoCancelForTesting::IncrementCountForTesting();
+  if (IsAutoCancelEnabledForTesting()) {
+    IncrementAutoCancelCountForTesting();
     OnClosePrintPreviewDialog();
   } else {
     web_ui()->CallJavascriptFunction("updatePrintPreview", ui_identifier,
                                      ui_preview_request_id);
   }
 }
 
 void PrintPreviewUI::OnPrintPreviewDialogDestroyed() {
   handler_->OnPrintPreviewDialogDestroyed();
 }
@@ skipping 46 matching lines @@
 }
 
 void PrintPreviewUI::OnReloadPrintersList() {
   web_ui()->CallJavascriptFunction("reloadPrintersList");
 }
 
 void PrintPreviewUI::OnPrintPreviewScalingDisabled() {
   web_ui()->CallJavascriptFunction("printScalingDisabledForSourcePDF");
 }
 
-static int g_auto_cancel_count_for_testing_ = -1;  // Disabled if count < 0.
-
 PrintPreviewUI::ScopedAutoCancelForTesting::ScopedAutoCancelForTesting() {
-  g_auto_cancel_count_for_testing_ = 0;
+  EnableAutoCancelAndResetCountForTesting();
 }
 
 PrintPreviewUI::ScopedAutoCancelForTesting::~ScopedAutoCancelForTesting() {
-  g_auto_cancel_count_for_testing_ = -1;
-}
-
-bool PrintPreviewUI::ScopedAutoCancelForTesting::IsEnabledForTesting() {
-  return (g_auto_cancel_count_for_testing_ >= 0);
-}
-
-void PrintPreviewUI::ScopedAutoCancelForTesting::IncrementCountForTesting() {
-  if (g_auto_cancel_count_for_testing_ >= 0)
-    ++g_auto_cancel_count_for_testing_;
+  DisableAutoCancelForTesting();
 }
 
 int PrintPreviewUI::ScopedAutoCancelForTesting::GetCountForTesting() {
-  return std::max(g_auto_cancel_count_for_testing_, -1);
+  return GetAutoCancelCountForTesting();
 }