Make the uninstall dialog use the correct parent window on Athena

chrome/browser/extensions/api/management/management_api.cc

Index: chrome/browser/extensions/api/management/management_api.cc
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc
index f13f883227c6e603c278c576bba8a0046371521b..33c061cb1f3a522ab211bb819dd1bd71280e9bf4 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -25,7 +25,6 @@
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/launch_util.h"
-#include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ -621,10 +620,10 @@ bool ManagementUninstallFunctionBase::Uninstall(
   if (auto_confirm_for_test == DO_NOT_SKIP) {
     if (show_confirm_dialog) {
       AddRef();  // Balanced in ExtensionUninstallAccepted/Canceled
-      extensions::WindowController* controller = GetExtensionWindowController();
+      content::WebContents* web_contents = GetAssociatedWebContents();
       extension_uninstall_dialog_.reset(ExtensionUninstallDialog::Create(
           GetProfile(),
-          controller ? controller->window()->GetNativeWindow() : NULL,
+          web_contents ? web_contents->GetTopLevelNativeWindow() : NULL,
           this));
       if (extension_id() != target_extension_id) {
         extension_uninstall_dialog_->ConfirmProgrammaticUninstall(