Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view

ui/views/controls/native/native_view_host_aura_unittest.cc

 // Copyright (c) 2013 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 "ui/views/controls/native/native_view_host_aura.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
+#include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 class NativeViewHostAuraTest : public ViewsTestBase {
  public:
   NativeViewHostAuraTest() {
   }
 
   NativeViewHostAura* native_host() {
     return static_cast<NativeViewHostAura*>(host_->native_wrapper_.get());
   }
 
+  NativeViewHost* host() {
+    return host_.get();
+  }
+
   Widget* child() {
     return child_.get();
   }
 
   void CreateHost() {
     // Create the top level widget.
     toplevel_.reset(new Widget);
     Widget::InitParams toplevel_params =
         CreateParams(Widget::InitParams::TYPE_WINDOW);
     toplevel_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
@@ skipping 30 matching lines @@
 TEST_F(NativeViewHostAuraTest, StopObservingNativeViewOnDestruct) {
   CreateHost();
   aura::Window* child_win = child()->GetNativeView();
   NativeViewHostAura* aura_host = native_host();
 
   EXPECT_TRUE(child_win->HasObserver(aura_host));
   DestroyHost();
   EXPECT_FALSE(child_win->HasObserver(aura_host));
 }
 
+// Tests that the kHostViewKey is correctly set and cleared.
+TEST_F(NativeViewHostAuraTest, HostViewPropertyKey) {
+  // Create the NativeViewHost and attach a NativeView.
+  CreateHost();
+  aura::Window* child_win = child()->GetNativeView();
+  EXPECT_EQ(host(), child_win->GetProperty(views::kHostViewKey));
+
+  host()->Detach();
+  EXPECT_FALSE(child_win->GetProperty(views::kHostViewKey));
+
+  host()->Attach(child_win);
+  EXPECT_EQ(host(), child_win->GetProperty(views::kHostViewKey));
+
+  DestroyHost();
+  EXPECT_FALSE(child_win->GetProperty(views::kHostViewKey));
+}
+
 }  // namespace views