[Extensions] Introduce a ScopedExtensionDialogAutoConfirm

chrome/browser/extensions/extension_uninstall_dialog.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/extensions/extension_uninstall_dialog.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/grit/generated_resources.h"
+#include "extensions/browser/extension_dialog_auto_confirm.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_resource.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_url_handlers.h"
@@ skipping 14 matching lines @@
 // pixel size under maximal supported scale factor.
 SkBitmap GetDefaultIconBitmapForMaxScaleFactor(bool is_app) {
   const gfx::ImageSkia& image =
       is_app ? util::GetDefaultAppIcon() : util::GetDefaultExtensionIcon();
   return image.GetRepresentation(
       gfx::ImageSkia::GetMaxSupportedScale()).sk_bitmap();
 }
 
 }  // namespace
 
-// static
-ExtensionUninstallDialog::AutoConfirmForTests
-ExtensionUninstallDialog::g_auto_confirm_for_testing =
-    ExtensionUninstallDialog::NONE;
-
-ExtensionUninstallDialog::ScopedAutoConfirm::ScopedAutoConfirm(
-    AutoConfirmForTests new_value)
-    : original_value_(g_auto_confirm_for_testing) {
-  g_auto_confirm_for_testing = new_value;
-}
-
-ExtensionUninstallDialog::ScopedAutoConfirm::~ScopedAutoConfirm() {
-  g_auto_confirm_for_testing = original_value_;
-}
-
 ExtensionUninstallDialog::ExtensionUninstallDialog(
     Profile* profile,
     ExtensionUninstallDialog::Delegate* delegate)
     : profile_(profile),
       delegate_(delegate),
       uninstall_reason_(UNINSTALL_REASON_FOR_TESTING) {
 }
 
 ExtensionUninstallDialog::~ExtensionUninstallDialog() {
 }
@@ skipping 54 matching lines @@
       ExtensionRegistry::Get(profile_)
           ->GetExtensionById(extension_id, ExtensionRegistry::EVERYTHING);
   if (!target_extension) {
     delegate_->OnExtensionUninstallDialogClosed(
         false, base::ASCIIToUTF16(kExtensionRemovedError));
     return;
   }
 
   SetIcon(image);
 
-  switch (g_auto_confirm_for_testing) {
-    case NONE:
+  switch (ScopedTestDialogAutoConfirm::GetAutoConfirmValue()) {
+    case ScopedTestDialogAutoConfirm::NONE:
       Show();
       break;
-    case ACCEPT:
+    case ScopedTestDialogAutoConfirm::ACCEPT:
       OnDialogClosed(CLOSE_ACTION_UNINSTALL);
       break;
-    case CANCEL:
+    case ScopedTestDialogAutoConfirm::CANCEL:
       OnDialogClosed(CLOSE_ACTION_CANCELED);
       break;
   }
 }
 
 std::string ExtensionUninstallDialog::GetHeadingText() {
   if (triggering_extension_) {
     return l10n_util::GetStringFUTF8(
         IDS_EXTENSION_PROGRAMMATIC_UNINSTALL_PROMPT_HEADING,
         base::UTF8ToUTF16(triggering_extension_->name()),
@@ skipping 50 matching lines @@
 void ExtensionUninstallDialog::HandleReportAbuse() {
   chrome::NavigateParams params(
       profile_,
       extension_urls::GetWebstoreReportAbuseUrl(extension_->id()),
       ui::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 }  // namespace extensions