MacViews: Implement CloseNow() as just -[NSWindow close].

ui/views/cocoa/bridged_native_widget_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 "ui/views/cocoa/bridged_native_widget.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
@@ skipping 188 matching lines @@
 }
 
 @end
 
 namespace views {
 namespace test {
 
 // Provides the |parent| argument to construct a BridgedNativeWidget.
 class MockNativeWidgetMac : public NativeWidgetMac {
  public:
-  MockNativeWidgetMac(Widget* delegate) : NativeWidgetMac(delegate) {}
+  explicit MockNativeWidgetMac(internal::NativeWidgetDelegate* delegate)
+      : NativeWidgetMac(delegate) {}
 
   // Expose a reference, so that it can be reset() independently.
   std::unique_ptr<BridgedNativeWidget>& bridge() { return bridge_; }
 
   // internal::NativeWidgetPrivate:
   void InitNativeWidget(const Widget::InitParams& params) override {
     ownership_ = params.ownership;
 
     // Usually the bridge gets initialized here. It is skipped to run extra
     // checks in tests, and so that a second window isn't created.
     delegate()->OnNativeWidgetCreated(true);
 
     // To allow events to dispatch to a view, it needs a way to get focus.
     bridge_->SetFocusManager(GetWidget()->GetFocusManager());
   }
 
   void ReorderNativeViews() override {
     // Called via Widget::Init to set the content view. No-op in these tests.
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockNativeWidgetMac);
 };
 
 // Helper test base to construct a BridgedNativeWidget with a valid parent.
 class BridgedNativeWidgetTestBase : public ui::CocoaTest {
  public:
+  struct SkipInitialization {};
+
   BridgedNativeWidgetTestBase()
       : widget_(new Widget),
-        native_widget_mac_(new MockNativeWidgetMac(widget_.get())) {
-  }
+        native_widget_mac_(new MockNativeWidgetMac(widget_.get())) {}
+
+  explicit BridgedNativeWidgetTestBase(SkipInitialization tag)
+      : native_widget_mac_(nullptr) {}
 
   std::unique_ptr<BridgedNativeWidget>& bridge() {
     return native_widget_mac_->bridge();
   }
 
   // Overridden from testing::Test:
   void SetUp() override {
     ui::CocoaTest::SetUp();
+
+    // MaterialDesignController leaks state across tests. See
+    // http://crbug.com/656871.
+    ui::test::MaterialDesignControllerTestAPI::Uninitialize();
     ui::MaterialDesignController::Initialize();
 
     init_params_.native_widget = native_widget_mac_;
 
     // Use a frameless window, otherwise Widget will try to center the window
     // before the tests covering the Init() flow are ready to do that.
     init_params_.type = Widget::InitParams::TYPE_WINDOW_FRAMELESS;
 
     // To control the lifetime without an actual window that must be closed,
     // tests in this file need to use WIDGET_OWNS_NATIVE_WIDGET.
     init_params_.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
 
     // Opacity defaults to "infer" which is usually updated by ViewsDelegate.
     init_params_.opacity = Widget::InitParams::OPAQUE_WINDOW;
 
     init_params_.bounds = gfx::Rect(100, 100, 100, 100);
 
-    native_widget_mac_->GetWidget()->Init(init_params_);
+    if (native_widget_mac_)
+      native_widget_mac_->GetWidget()->Init(init_params_);
   }
 
   void TearDown() override {
     ui::test::MaterialDesignControllerTestAPI::Uninitialize();
     ui::CocoaTest::TearDown();
   }
 
  protected:
   std::unique_ptr<Widget> widget_;
   MockNativeWidgetMac* native_widget_mac_;  // Weak. Owned by |widget_|.
@@ skipping 319 matching lines @@
   EXPECT_NSEQ(test_window(), [view window]);
 
   // The superview of a contentView is an NSNextStepFrame.
   EXPECT_TRUE([view superview]);
   EXPECT_TRUE([view hostedView]);
 
   // Ensure the tracking area to propagate mouseMoved: events to the RootView is
   // installed.
   EXPECT_EQ(1u, [[view trackingAreas] count]);
 
-  // Destroying the C++ bridge should remove references to any C++ objects in
-  // the ObjectiveC object, and remove it from the hierarchy.
-  bridge().reset();
+  // Closing the window should tear down the C++ bridge, remove references to
+  // any C++ objects in the ObjectiveC object, and remove it from the hierarchy.
+  [test_window() close];
   EXPECT_FALSE([view hostedView]);
   EXPECT_FALSE([view superview]);
   EXPECT_FALSE([view window]);
   EXPECT_EQ(0u, [[view trackingAreas] count]);
   EXPECT_FALSE([test_window() contentView]);
   EXPECT_FALSE([test_window() delegate]);
 }
 
 TEST_F(BridgedNativeWidgetTest, BridgedNativeWidgetTest_TestViewDisplay) {
   [bridge()->ns_view() display];
@@ skipping 19 matching lines @@
   EXPECT_EQ(kTestNewHeight, view_->height());
 }
 
 TEST_F(BridgedNativeWidgetTest, GetInputMethodShouldNotReturnNull) {
   EXPECT_TRUE(bridge()->GetInputMethod());
 }
 
 // A simpler test harness for testing initialization flows.
 class BridgedNativeWidgetInitTest : public BridgedNativeWidgetTestBase {
  public:
-  BridgedNativeWidgetInitTest() {}
+  BridgedNativeWidgetInitTest()
+      : BridgedNativeWidgetTestBase(SkipInitialization()) {}
 
   // Prepares a new |window_| and |widget_| for a call to PerformInit().
   void CreateNewWidgetToInit(NSUInteger style_mask) {
     window_.reset(
         [[NSWindow alloc] initWithContentRect:ui::kWindowSizeDeterminedLater
                                     styleMask:style_mask
                                       backing:NSBackingStoreBuffered
                                         defer:NO]);
     [window_ setReleasedWhenClosed:NO];  // Owned by scoped_nsobject.
     widget_.reset(new Widget);
     native_widget_mac_ = new MockNativeWidgetMac(widget_.get());
     init_params_.native_widget = native_widget_mac_;
   }
 
   void PerformInit() {
     widget_->Init(init_params_);
     bridge()->Init(window_, init_params_);
   }
 
  protected:
   base::scoped_nsobject<NSWindow> window_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidgetInitTest);
 };
 
 // Test that BridgedNativeWidget remains sane if Init() is never called.

[tapted, 2016/10/18 05:09:09]

This was actually a lie :) -- Init() was previously called in TestBase::SetUp,
but that is skipped now.

 TEST_F(BridgedNativeWidgetInitTest, InitNotCalled) {
+  // Don't use a Widget* as the delegate. ~Widget() checks for Widget::
+  // |native_widget_destroyed_| being set to true. That can only happen with a
+  // non-null WidgetDelegate, which is only set in Widget::Init().
+  native_widget_mac_ = new MockNativeWidgetMac(nullptr);
   EXPECT_FALSE(bridge()->ns_view());
   EXPECT_FALSE(bridge()->ns_window());
-  bridge().reset();
+  delete native_widget_mac_;

[karandeepb, 2016/10/18 10:00:29]

nit: Create a local std::unique_ptr and assign its pointer to native_widget_mac_
to avoid explicit deletion.

[tapted, 2016/10/19 06:20:25]

Done.

 }
 
 // Tests the shadow type given in InitParams.
 TEST_F(BridgedNativeWidgetInitTest, ShadowType) {
   // Verify Widget::InitParam defaults and arguments added from SetUp().
   EXPECT_EQ(Widget::InitParams::TYPE_WINDOW_FRAMELESS, init_params_.type);
   EXPECT_EQ(Widget::InitParams::OPAQUE_WINDOW, init_params_.opacity);
   EXPECT_EQ(Widget::InitParams::SHADOW_TYPE_DEFAULT, init_params_.shadow_type);
 
   CreateNewWidgetToInit(NSBorderlessWindowMask);
@@ skipping 616 matching lines @@
   [center postNotificationName:NSWindowDidExitFullScreenNotification
                         object:window];
   EXPECT_EQ(1, [window ignoredToggleFullScreenCount]);  // No change.
   EXPECT_FALSE(bridge()->target_fullscreen_state());
 
   widget_->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views