Revert 110264 - Fix for management API related to escalated permissions disabled extensions

chrome/browser/extensions/extension_install_dialog.cc

 // Copyright (c) 2011 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_install_dialog.h"
 
-#include "base/bind.h"
 #include "base/file_path.h"
-#include "base/message_loop.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 
-namespace {
-
-// A flag used for SetExtensionInstallDialogAutoConfirmForTests
+// A flag used for SetExtensionInstallDialogForManifestAutoConfirmForTests
 enum AutoConfirmForTest {
   DO_NOT_SKIP = 0,
   PROCEED,
   ABORT
 };
 AutoConfirmForTest auto_confirm_for_tests = DO_NOT_SKIP;
 
-void AutoConfirmTask(ExtensionInstallUI::Delegate* delegate, bool proceed) {
-  if (proceed)
-    delegate->InstallUIProceed();
-  else
-    delegate->InstallUIAbort(true);
-}
-
-void DoAutoConfirm(ExtensionInstallUI::Delegate* delegate) {
-  bool proceed = (auto_confirm_for_tests == PROCEED);
-  // We use PostTask instead of calling the delegate directly here, because in
-  // the real implementations it's highly likely the message loop will be
-  // pumping a few times before the user clicks accept or cancel.
-  MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&AutoConfirmTask, delegate, proceed));
-}
-
-}  // namespace
-
-void ShowExtensionInstallDialog(Profile* profile,
-                                ExtensionInstallUI::Delegate* delegate,
-                                const Extension* extension,
-                                SkBitmap* icon,
-                                const ExtensionInstallUI::Prompt& prompt) {
-  if (auto_confirm_for_tests != DO_NOT_SKIP) {
-    DoAutoConfirm(delegate);
-    return;
-  }
-  ShowExtensionInstallDialogImpl(profile, delegate, extension, icon, prompt);
-}
-
 bool ShowExtensionInstallDialogForManifest(
     Profile *profile,
     ExtensionInstallUI::Delegate* delegate,
     const DictionaryValue* manifest,
     const std::string& id,
     const std::string& localized_name,
     const std::string& localized_description,
     SkBitmap* icon,
     const ExtensionInstallUI::Prompt& prompt,
     scoped_refptr<Extension>* dummy_extension) {
@@ skipping 22 matching lines @@
     return false;
   }
 
   if (icon->empty())
     icon = const_cast<SkBitmap*>(&Extension::GetDefaultIcon(
         (*dummy_extension)->is_app()));
 
   // In tests, we may have setup to proceed or abort without putting up the real
   // confirmation dialog.
   if (auto_confirm_for_tests != DO_NOT_SKIP) {
-    DoAutoConfirm(delegate);
+    if (auto_confirm_for_tests == PROCEED)
+      delegate->InstallUIProceed();
+    else
+      delegate->InstallUIAbort(true);
     return true;
   }
 
   ExtensionInstallUI::Prompt filled_out_prompt = prompt;
   filled_out_prompt.SetPermissions(
       (*dummy_extension)->GetPermissionMessageStrings());
 
   ShowExtensionInstallDialog(profile,
                              delegate,
                              dummy_extension->get(),
                              icon,
                              filled_out_prompt);
   return true;
 }
 
-void SetExtensionInstallDialogAutoConfirmForTests(
+void SetExtensionInstallDialogForManifestAutoConfirmForTests(
     bool should_proceed) {
   auto_confirm_for_tests = should_proceed ? PROCEED : ABORT;
 }