[Mac] Address buggy permission bubble behaviour on dismissal via ESC.

chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.mm

 // Copyright 2014 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/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 
 #include "base/memory/ptr_util.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 #import "chrome/browser/ui/website_settings/permission_prompt.h"
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/nsview_additions.h"
 
 PermissionBubbleCocoa::PermissionBubbleCocoa(Browser* browser)
-    : browser_(browser), delegate_(nullptr), bubbleController_(nil) {
-  DCHECK(browser);
-}
+    : browser_(browser), delegate_(nullptr), bubbleController_(nil) {}

[hcarmona, 2016/10/10 18:08:19]

Why is the DCHECK moved?

[dominickn, 2016/10/10 22:55:48]

A number of browser and unit tests do navigations, which run through
PermissionRequestManager::DidNavigateMainFrame, which calls FinalizeBubble,
which now creates a bubble if one doesn't exist. In many cases, a null browser
pointer is sent into the constructor here (and in the views impl too).

To fix those tests, I moved the DCHECK to the methods which actually need the
non-null pointer. This means that the tests work, and we still ensure that any
test which tries to show or otherwise do UI-related things to bubbles still have
the DCHECK.

[hcarmona, 2016/10/11 14:45:33]

Sounds good.

 
 PermissionBubbleCocoa::~PermissionBubbleCocoa() {
 }
 
 void PermissionBubbleCocoa::Show(
     const std::vector<PermissionRequest*>& requests,
     const std::vector<bool>& accept_state) {
+  DCHECK(browser_);
+
   if (!bubbleController_) {
     bubbleController_ =
         [[PermissionBubbleController alloc] initWithBrowser:browser_
                                                      bridge:this];
   }
 
   [bubbleController_ showWithDelegate:delegate_
                           forRequests:requests
                          acceptStates:accept_state];
 }
@@ skipping 20 matching lines @@
   [bubbleController_ updateAnchorPosition];
 }
 
 gfx::NativeWindow PermissionBubbleCocoa::GetNativeWindow() {
   return [bubbleController_ window];
 }
 
 void PermissionBubbleCocoa::OnBubbleClosing() {
   bubbleController_ = nil;
 }