Make CWS Report Abuse page the active tab after report abuse and uninstall

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"
@@ skipping 108 matching lines @@
         false, base::ASCIIToUTF16(kExtensionRemovedError));
     return;
   }
 
   SetIcon(image);
 
   switch (ScopedTestDialogAutoConfirm::GetAutoConfirmValue()) {
     case ScopedTestDialogAutoConfirm::NONE:
       Show();
       break;
+    case ScopedTestDialogAutoConfirm::ACCEPT_AND_OPTION:
+      OnDialogClosed(CLOSE_ACTION_UNINSTALL_AND_REPORT_ABUSE);
+      break;
     case ScopedTestDialogAutoConfirm::ACCEPT:
       OnDialogClosed(CLOSE_ACTION_UNINSTALL);
       break;
     case ScopedTestDialogAutoConfirm::CANCEL:
       OnDialogClosed(CLOSE_ACTION_CANCELED);
       break;
   }
 }
 
 std::string ExtensionUninstallDialog::GetHeadingText() {
@@ skipping 17 matching lines @@
   if (ShouldShowReportAbuseCheckbox()) {
     UMA_HISTOGRAM_ENUMERATION("Extensions.UninstallDialogAction",
                               action,
                               CLOSE_ACTION_LAST);
   }
 
   bool success = false;
   base::string16 error;
   switch (action) {
     case CLOSE_ACTION_UNINSTALL_AND_REPORT_ABUSE:
+      // If the extension specifies a custom uninstall page via
+      // chrome.runtime.setUninstallURL, then at uninstallation its uninstall
+      // page opens. To ensure that the CWS Report Abuse page is the active tab
+      // at uninstallation, HandleReportAbuse() is called after Uninstall().
+      Uninstall(&success, &error);
       HandleReportAbuse();
-    // Fall through.
+      break;
     case CLOSE_ACTION_UNINSTALL: {
-      const Extension* current_extension =
-          ExtensionRegistry::Get(profile_)->GetExtensionById(
-              extension_->id(), ExtensionRegistry::EVERYTHING);
-      if (current_extension) {
-        success =
-            ExtensionSystem::Get(profile_)
-                ->extension_service()
-                ->UninstallExtension(extension_->id(), uninstall_reason_,
-                                     base::Bind(&base::DoNothing), &error);
-      } else {
-        error = base::ASCIIToUTF16(kExtensionRemovedError);
-      }
+      Uninstall(&success, &error);
       break;
     }
     case CLOSE_ACTION_CANCELED:
       error = base::ASCIIToUTF16("User canceled uninstall dialog");
       break;
     case CLOSE_ACTION_LAST:
       NOTREACHED();
   }
+  delegate_->OnExtensionUninstallDialogClosed(success, error);
+}
 
-  delegate_->OnExtensionUninstallDialogClosed(success, error);
+void ExtensionUninstallDialog::Uninstall(bool* success, base::string16* error) {
+  const Extension* current_extension =
+      ExtensionRegistry::Get(profile_)->GetExtensionById(
+          extension_->id(), ExtensionRegistry::EVERYTHING);
+  if (current_extension) {
+    *success =
+        ExtensionSystem::Get(profile_)->extension_service()->UninstallExtension(
+            extension_->id(), uninstall_reason_, base::Bind(&base::DoNothing),
+            error);
+  } else {
+    *error = base::ASCIIToUTF16(kExtensionRemovedError);
+  }
 }
 
 void ExtensionUninstallDialog::HandleReportAbuse() {
   chrome::NavigateParams params(
       profile_,
       extension_urls::GetWebstoreReportAbuseUrl(extension_->id(), kReferrerId),
       ui::PAGE_TRANSITION_LINK);
   params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 }
 
 }  // namespace extensions