Add management.uninstallSelf to API

chrome/browser/extensions/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 "chrome/browser/extensions/api/management/management_api.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 495 matching lines @@
   SendResponse(false);
   Release();
 }
 
 ManagementUninstallFunction::ManagementUninstallFunction() {
 }
 
 ManagementUninstallFunction::~ManagementUninstallFunction() {
 }
 
-bool ManagementUninstallFunction::RunImpl() {
-  scoped_ptr<management::Uninstall::Params> params(
-      management::Uninstall::Params::Create(*args_));
-  EXTENSION_FUNCTION_VALIDATE(params.get());
-
-  extension_id_ = params->id;
-
-  bool show_confirm_dialog = false;
-  if (params->options.get() && params->options->show_confirm_dialog.get())
-    show_confirm_dialog = *params->options->show_confirm_dialog;
-
+bool ManagementUninstallFunction::DoUninstall(bool show_confirm_dialog) {
   const Extension* extension = service()->GetExtensionById(extension_id_, true);
   if (!extension) {
     error_ = ErrorUtils::FormatErrorMessage(
         keys::kNoExtensionError, extension_id_);
     return false;
   }
 
   if (!ExtensionSystem::Get(profile())->management_policy()->
       UserMayModifySettings(extension, NULL)) {
     error_ = ErrorUtils::FormatErrorMessage(
@@ skipping 10 matching lines @@
     } else {
       Finish(true);
     }
   } else {
     Finish(auto_confirm_for_test == PROCEED);
   }
 
   return true;
 }
 
+bool ManagementUninstallFunction::RunImpl() {
+  scoped_ptr<management::Uninstall::Params> params(
+      management::Uninstall::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  extension_id_ = params->id;
+
+  bool show_confirm_dialog = false;
+  if (params->options.get() && params->options->show_confirm_dialog.get())
+    show_confirm_dialog = *params->options->show_confirm_dialog;
+
+  return DoUninstall(show_confirm_dialog);
+}
+
 // static
 void ManagementUninstallFunction::SetAutoConfirmForTest(bool should_proceed) {
   auto_confirm_for_test = should_proceed ? PROCEED : ABORT;
 }
 
+void ManagementUninstallFunction::set_extension_id(
+    const std::string& extension_id) {
+  extension_id_ = extension_id;
+}
+
 void ManagementUninstallFunction::Finish(bool should_uninstall) {
   if (should_uninstall) {
     bool success = service()->UninstallExtension(
         extension_id_,
         false, /* external uninstall */
         NULL);
 
     // TODO set error_ if !success
     SendResponse(success);
   } else {
     error_ = ErrorUtils::FormatErrorMessage(
         keys::kUninstallCanceledError, extension_id_);
     SendResponse(false);
   }
 
 }
 
+ManagementUninstallSelfFunction::ManagementUninstallSelfFunction() {

[koz (OOO until 15th September), 2013/01/29 05:20:26]

The definitions of functions for a class should all be contiguous (ie: these
definitions shouldn't come in the middle of the ManagementUninstallFunction
definitions).

[calamity, 2013/01/29 06:06:16]

Done.

+}
+
+ManagementUninstallSelfFunction::~ManagementUninstallSelfFunction() {
+}
+
+bool ManagementUninstallSelfFunction::RunImpl() {
+  scoped_ptr<management::UninstallSelf::Params> params(
+      management::UninstallSelf::Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+
+  set_extension_id(extension_->id());
+
+  bool show_confirm_dialog = false;
+  if (params->options.get() && params->options->show_confirm_dialog.get())
+    show_confirm_dialog = *params->options->show_confirm_dialog;
+  return DoUninstall(show_confirm_dialog);
+}
+
 void ManagementUninstallFunction::ExtensionUninstallAccepted() {
   Finish(true);
   Release();
 }
 
 void ManagementUninstallFunction::ExtensionUninstallCanceled() {
   Finish(false);
   Release();
 }
 
@@ skipping 90 matching lines @@
 ProfileKeyedAPIFactory<ManagementAPI>* ManagementAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 void ManagementAPI::OnListenerAdded(const EventListenerInfo& details) {
   management_event_router_.reset(new ManagementEventRouter(profile_));
   ExtensionSystem::Get(profile_)->event_router()->UnregisterObserver(this);
 }
 
 }  // namespace extensions