Revert of Fix ExtensionPopup close issue.

chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 
 #include <algorithm>
 
 #include "base/callback.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 196 matching lines @@
 - (void)close {
   // |windowWillClose:| could have already been called. http://crbug.com/279505
   if (host_) {
     web_modal::WebContentsModalDialogManager* modalDialogManager =
         web_modal::WebContentsModalDialogManager::FromWebContents(
             host_->host_contents());
     if (modalDialogManager &&
         modalDialogManager->IsDialogActive()) {
       return;
     }
-    // We must shutdown host_ immediately, and it will notify RendererProcess
-    // right away. We can't wait to do it in
-    // -[ExtensionPopController windowWillClose:...]
-    if (host_->view())
-      host_->view()->set_container(NULL);
-    host_.reset();
   }
   [super close];
 }
 
-- (void)windowWillClose:(NSNotification*)notification {
+- (void)windowWillClose:(NSNotification *)notification {
   [super windowWillClose:notification];
   if (gPopup == self)
     gPopup = nil;
+  if (host_->view())
+    host_->view()->set_container(NULL);
+  host_.reset();
 }
 
 - (void)windowDidResignKey:(NSNotification*)notification {
   // |windowWillClose:| could have already been called. http://crbug.com/279505
   if (host_) {
     // When a modal dialog is opened on top of the popup and when it's closed,
     // it steals key-ness from the popup. Don't close the popup when this
     // happens. There's an extra windowDidResignKey: notification after the
     // modal dialog closes that should also be ignored.
     web_modal::WebContentsModalDialogManager* modalDialogManager =
@@ skipping 35 matching lines @@
   DCHECK(browser);
   if (!browser)
     return nil;
 
   extensions::ExtensionViewHost* host =
       extensions::ExtensionViewHostFactory::CreatePopupHost(url, browser);
   DCHECK(host);
   if (!host)
     return nil;
 
-  // Since we only close without releasing(see bug:351278), we need to shutdown
-  // host_ in -[ExtensionPopupController close] immediately. If not, host_ might
-  // not be released even when new ExtensionPopupController is ready. And
-  // this causes bug:376511.
-  // See above -[ExtensionPopupController close].
   [gPopup close];
 
   // Takes ownership of |host|. Also will autorelease itself when the popup is
   // closed, so no need to do that here.
   gPopup = [[ExtensionPopupController alloc]
       initWithHost:host
       parentWindow:browser->window()->GetNativeWindow()
         anchoredAt:anchoredAt
      arrowLocation:arrowLocation
            devMode:devMode];
@@ skipping 84 matching lines @@
   [extensionView_ setFrame:frame];
   [extensionView_ setNeedsDisplay:YES];
 }
 
 - (void)onViewDidShow {
   [self onSizeChanged:pendingSize_];
 }
 
 - (void)windowDidResize:(NSNotification*)notification {
   // Let the extension view know, so that it can tell plugins.
-  if (host_ && host_->view())
+  if (host_->view())
     host_->view()->WindowFrameChanged();
 }
 
 - (void)windowDidMove:(NSNotification*)notification {
   // Let the extension view know, so that it can tell plugins.
-  if (host_ && host_->view())
+  if (host_->view())
     host_->view()->WindowFrameChanged();
 }
 
 // Private (TestingAPI)
 - (NSView*)view {
   return extensionView_;
 }
 
 // Private (TestingAPI)
 + (NSSize)minPopupSize {
   NSSize minSize = {ExtensionViewMac::kMinWidth, ExtensionViewMac::kMinHeight};
   return minSize;
 }
 
 // Private (TestingAPI)
 + (NSSize)maxPopupSize {
   NSSize maxSize = {ExtensionViewMac::kMaxWidth, ExtensionViewMac::kMaxHeight};
   return maxSize;
 }
 
 @end