MacViews: Retain non-Widget parent NSWindows, as well as the anchor NSView.

ui/views/widget/native_widget_mac_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/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
@@ skipping 391 matching lines @@
 
   id hit = [widget->GetNativeWindow() accessibilityHitTest:midpoint];
   id title = [hit accessibilityAttributeValue:NSAccessibilityTitleAttribute];
   EXPECT_NSEQ(title, @"Green");
 }
 
 // Tests creating a views::Widget parented off a native NSWindow.
 TEST_F(NativeWidgetMacTest, NonWidgetParent) {
   NSWindow* native_parent = MakeNativeParent();
 
+  base::scoped_nsobject<NSView> anchor_view(
+      [[NSView alloc] initWithFrame:[[native_parent contentView] bounds]]);
+  [[native_parent contentView] addSubview:anchor_view];
+
   // Note: Don't use WidgetTest::CreateChildPlatformWidget because that makes
   // windows of TYPE_CONTROL which are automatically made visible. But still
   // mark it as a child to test window positioning.
   Widget* child = new Widget;
   Widget::InitParams init_params;
-  init_params.parent = [native_parent contentView];
+  init_params.parent = anchor_view;
   init_params.child = true;
   child->Init(init_params);
 
   TestWidgetObserver child_observer(child);
 
   // GetTopLevelNativeWidget() only goes as far as there exists a Widget (i.e.
   // must stop at |child|.
   internal::NativeWidgetPrivate* top_level_widget =
       internal::NativeWidgetPrivate::GetTopLevelNativeWidget(
           child->GetNativeView());
   EXPECT_EQ(child, top_level_widget->GetWidget());
 
   // To verify the parent, we need to use NativeWidgetMac APIs.
   BridgedNativeWidget* bridged_native_widget =
       NativeWidgetMac::GetBridgeForNativeWindow(child->GetNativeWindow());
   EXPECT_EQ(native_parent, bridged_native_widget->parent()->GetNSWindow());
 
   child->SetBounds(gfx::Rect(50, 50, 200, 100));
   EXPECT_FALSE(child->IsVisible());
   EXPECT_EQ(0u, [[native_parent childWindows] count]);
 
   child->Show();
   EXPECT_TRUE(child->IsVisible());
   EXPECT_EQ(1u, [[native_parent childWindows] count]);
   EXPECT_EQ(child->GetNativeWindow(),
             [[native_parent childWindows] objectAtIndex:0]);
   EXPECT_EQ(native_parent, [child->GetNativeWindow() parentWindow]);
 
   // Child should be positioned on screen relative to the parent, but note we
-  // positioned the parent in Cooca coordinates, so we need to convert.
+  // positioned the parent in Cocoa coordinates, so we need to convert.
   gfx::Point parent_origin = gfx::ScreenRectFromNSRect(ParentRect()).origin();
   EXPECT_EQ(gfx::Rect(150, parent_origin.y() + 50, 200, 100),
             child->GetWindowBoundsInScreen());
 
+  // Removing the anchor_view from its view hierarchy is permitted. This should
+  // not break the relationship between the two windows.
+  [anchor_view removeFromSuperview];
+  anchor_view.reset();
+  EXPECT_EQ(native_parent, bridged_native_widget->parent()->GetNSWindow());
+
   // Closing the parent should close and destroy the child.
   EXPECT_FALSE(child_observer.widget_closed());
   [native_parent close];
   EXPECT_TRUE(child_observer.widget_closed());
 
   EXPECT_EQ(0u, [[native_parent childWindows] count]);
 }
 
 // Use Native APIs to query the tooltip text that would be shown once the
 // tooltip delay had elapsed.
@@ skipping 231 matching lines @@
 }
 
 }  // namespace test
 }  // namespace views
 
 @implementation TestStopAnimationWaiter
 - (void)setWindowStateForEnd {
   views::test::ScopedSwizzleWaiter::GetMethodAndMarkCalled()(self, _cmd);
 }
 @end