[Extensions] Introduce a ScopedExtensionDialogAutoConfirm

extensions/browser/api/management/management_api.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 "extensions/browser/api/management/management_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 523 matching lines @@
 
   // Note: null extension() means it's WebUI.
   bool self_uninstall = extension() && extension_id() == target_extension_id_;
   // We need to show a dialog for any extension uninstalling another extension.
   show_confirm_dialog |= !self_uninstall;
 
   if (show_confirm_dialog && !user_gesture())
     return RespondNow(Error(keys::kGestureNeededForUninstallError));
 
   if (show_confirm_dialog) {
-    switch (auto_confirm_for_test) {

[Devlin, 2015/05/29 15:29:20]

Woo!  Die, silly code, die!!

-      case DO_NOT_SKIP: {
-        // We show the programmatic uninstall ui for extensions uninstalling
-        // other extensions.
-        bool show_programmatic_uninstall_ui = !self_uninstall && extension();
-        AddRef();  // Balanced in OnExtensionUninstallDialogClosed.
-        // TODO(devlin): A method called "UninstallFunctionDelegate" does not in
-        // any way imply that this actually creates a dialog and runs it.
-        uninstall_dialog_ =
-            delegate->UninstallFunctionDelegate(
-                this,
-                target_extension,
-                show_programmatic_uninstall_ui);
-        break;
-      }
-      case PROCEED: {
-        // Skip the confirm dialog for testing.
-        base::MessageLoop::current()->PostTask(
-            FROM_HERE,
-            base::Bind(&ManagementUninstallFunctionBase::UninstallExtension,
-                       this));
-        break;
-      }
-      case ABORT: {
-        // Fake the user canceling.
-        base::MessageLoop::current()->PostTask(
-            FROM_HERE,
-            base::Bind(
-                &ManagementUninstallFunctionBase::Finish, this, false,
-                ErrorUtils::FormatErrorMessage(keys::kUninstallCanceledError,
-                                               target_extension_id_)));
-      }
-    }
+    // We show the programmatic uninstall ui for extensions uninstalling
+    // other extensions.
+    bool show_programmatic_uninstall_ui = !self_uninstall && extension();
+    AddRef();  // Balanced in OnExtensionUninstallDialogClosed.
+    // TODO(devlin): A method called "UninstallFunctionDelegate" does not in
+    // any way imply that this actually creates a dialog and runs it.
+    uninstall_dialog_ = delegate->UninstallFunctionDelegate(
+        this, target_extension, show_programmatic_uninstall_ui);
   } else {  // No confirm dialog.
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ManagementUninstallFunctionBase::UninstallExtension, this));
   }
 
   return RespondLater();
 }
 
 void ManagementUninstallFunctionBase::Finish(bool did_start_uninstall,
                                              const std::string& error) {
   Respond(did_start_uninstall ? NoArguments() : Error(error));
 }
 
 void ManagementUninstallFunctionBase::OnExtensionUninstallDialogClosed(
     bool did_start_uninstall,
     const base::string16& error) {
-  Finish(did_start_uninstall, base::UTF16ToUTF8(error));
+  Finish(did_start_uninstall,
+         ErrorUtils::FormatErrorMessage(keys::kUninstallCanceledError,
+                                        target_extension_id_));
   Release();  // Balanced in Uninstall().
 }
 
 void ManagementUninstallFunctionBase::UninstallExtension() {
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* target_extension =
       extensions::ExtensionRegistry::Get(browser_context())
           ->GetExtensionById(target_extension_id_,
                              ExtensionRegistry::EVERYTHING);
   std::string error;
   bool success = false;
   if (target_extension) {
     const ManagementAPIDelegate* delegate = ManagementAPI::GetFactoryInstance()
                                                 ->Get(browser_context())
                                                 ->GetDelegate();
     base::string16 utf16_error;
     success = delegate->UninstallExtension(
         browser_context(), target_extension_id_,
         extensions::UNINSTALL_REASON_MANAGEMENT_API,
         base::Bind(&base::DoNothing), &utf16_error);
     error = base::UTF16ToUTF8(utf16_error);
   } else {
     error = ErrorUtils::FormatErrorMessage(keys::kNoExtensionError,
                                            target_extension_id_);
   }
   Finish(success, error);
 }
 
-// static
-void ManagementUninstallFunctionBase::SetAutoConfirmForTest(
-    bool should_proceed) {
-  auto_confirm_for_test = should_proceed ? PROCEED : ABORT;
-}
-
 ManagementUninstallFunction::ManagementUninstallFunction() {
 }
 
 ManagementUninstallFunction::~ManagementUninstallFunction() {
 }
 
 ExtensionFunction::ResponseAction ManagementUninstallFunction::Run() {
   scoped_ptr<management::Uninstall::Params> params(
       management::Uninstall::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ skipping 287 matching lines @@
 ManagementAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
   management_event_router_.reset(new ManagementEventRouter(browser_context_));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions