Use WebContents instead of Browser to construct PermissionPrompt

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.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.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/permissions/mock_permission_request.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #import "chrome/browser/ui/cocoa/website_settings/split_block_button.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
+#include "content/public/browser/web_contents.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
 @class ConstrainedWindowButton;
 
 @interface PermissionBubbleController (ExposedForTesting)
@@ skipping 35 matching lines @@
 
   MOCK_METHOD2(ToggleAccept, void(int, bool));
   MOCK_METHOD0(SetCustomizationMode, void());
   MOCK_METHOD0(Accept, void());
   MOCK_METHOD0(Deny, void());
   MOCK_METHOD0(Closing, void());
   MOCK_METHOD1(SetView, void(PermissionPrompt*));
 
   void SetUp() override {
     CocoaProfileTest::SetUp();
-    bridge_.reset(new PermissionBubbleCocoa(browser()));
+    content::WebContents* web_contents = content::WebContents::Create(
+        content::WebContents::CreateParams(profile()));
+    TabStripModel* model = browser()->tab_strip_model();
+    model->AppendWebContents(web_contents, true);

[raymes, 2016/09/15 02:07:32]

Please get someone else to take a look at this (tapted?) - it looks right but
I'm not so familiar with this type of code.

[lshang, 2016/09/15 09:45:06]

NaN. As Trent suggested, we will just change the interface of PermissionPrompt
but not platform-specific implementations, so we'll still use Browser to
construct PermissionPrompt on Mac.

+    bridge_.reset(new PermissionBubbleCocoa(web_contents));
     AddRequest(kPermissionA);
     controller_ =
         [[PermissionBubbleController alloc] initWithBrowser:browser()
                                                      bridge:bridge_.get()];
   }
 
   void TearDown() override {
     [controller_ close];
     chrome::testing::NSRunLoopRunAllPending();
     base::STLDeleteElements(&requests_);
@@ skipping 308 matching lines @@
     base::mac::ScopedObjCClassSwizzler locationSwizzle(
         [PermissionBubbleController class], [MockBubbleNoLocationBar class],
         @selector(hasVisibleLocationBarForBrowser:));
     withoutLocationBar = [controller_ getExpectedAnchorPoint];
   }
 
   // The bubble should be in different places depending if the location bar is
   // available or not.
   EXPECT_NSNE(withLocationBar, withoutLocationBar);
 }