Reland: Implement features in NativeViewHostAura for scroll end effect

ui/views/controls/native/native_view_host_unittest.cc

 // Copyright (c) 2012 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.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
@@ skipping 130 matching lines @@
 TEST_F(NativeViewHostTest, NativeViewHierarchyChanged) {
   // Create a child widget.
   NativeViewHierarchyChangedTestView* test_view =
       new NativeViewHierarchyChangedTestView;
   NativeViewHost* host = new NativeViewHost;
   scoped_ptr<Widget> child(CreateChildForHost(toplevel()->GetNativeView(),
                                               toplevel()->GetRootView(),
                                               test_view,
                                               host));
 
+#if defined(USE_AURA)
+  // One notification is generated from inserting the clipping window into the
+  // hierarchy.
+  EXPECT_EQ(1, test_view->notification_count());
+#else
   EXPECT_EQ(0, test_view->notification_count());
+#endif
   test_view->ResetCount();
 
   // Detaching should send a NativeViewHierarchyChanged() notification and
   // change the parent.
   host->Detach();
+#if defined(USE_AURA)
+  // The clipping window is removed on detach, so there is an extra hiearchy
+  // change.
+  EXPECT_EQ(2, test_view->notification_count());
+#else
   EXPECT_EQ(1, test_view->notification_count());
+#endif
   EXPECT_NE(toplevel()->GetNativeView(),
             GetNativeParent(child->GetNativeView()));
   test_view->ResetCount();
 
   // Attaching should send a NativeViewHierarchyChanged() notification and
   // reset the parent.
   host->Attach(child->GetNativeView());
   EXPECT_EQ(1, test_view->notification_count());
+#if defined(USE_AURA)
+  // There is a clipping window inserted above the native view that needs to be
+  // accounted for when looking at the relationship between the native views..
+  EXPECT_EQ(toplevel()->GetNativeView(),
+            GetNativeParent(GetNativeParent(child->GetNativeView())));
+#else
   EXPECT_EQ(toplevel()->GetNativeView(),
             GetNativeParent(child->GetNativeView()));
+#endif
 }
 
 // Verifies ViewHierarchyChanged handles NativeViewHost remove, add and move
 // (reparent) operations with correct parent changes.
 // This exercises the non-recursive code paths in
 // View::PropagateRemoveNotifications() and View::PropagateAddNotifications().
 TEST_F(NativeViewHostTest, ViewHierarchyChangedForHost) {
   // Original tree:
   // toplevel
   // +-- host0 (NativeViewHost)
@@ skipping 111 matching lines @@
   host0->ResetParentChanges();
   host1->ResetParentChanges();
   EXPECT_EQ(0, host0->num_parent_changes());
   EXPECT_EQ(0, host1->num_parent_changes());
   child0->GetContentsView()->AddChildView(view1);
   EXPECT_EQ(0, host0->num_parent_changes());
   EXPECT_EQ(2, host1->num_parent_changes());
 }
 
 }  // namespace views