Revert of Implement NativeViewHostAura::InstallClip.

ui/views/controls/native/native_view_host_aura_unittest.cc

Index: ui/views/controls/native/native_view_host_aura_unittest.cc
diff --git a/ui/views/controls/native/native_view_host_aura_unittest.cc b/ui/views/controls/native/native_view_host_aura_unittest.cc
index 2726ba93831c1c9098131a6e2b6184614d61e70b..f6dc561f2f04fdaffb166e61141631d07b5dafce 100644
--- a/ui/views/controls/native/native_view_host_aura_unittest.cc
+++ b/ui/views/controls/native/native_view_host_aura_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/views/controls/native/native_view_host.h"
@@ -16,23 +15,6 @@
 #include "ui/views/widget/widget.h"
 
 namespace views {
-
-// Testing wrapper of the NativeViewHost
-class NativeViewHostTesting : public NativeViewHost {
- public:
-  NativeViewHostTesting() {}
-  virtual ~NativeViewHostTesting() { destroyed_count_++; }
-
-  static void ResetDestroyedCount() { destroyed_count_ = 0; }
-
-  static int destroyed_count() { return destroyed_count_; }
-
- private:
-  static int destroyed_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(NativeViewHostTesting);
-};
-int NativeViewHostTesting::destroyed_count_ = 0;
 
 class NativeViewHostAuraTest : public ViewsTestBase {
  public:
@@ -55,8 +37,6 @@
     return child_.get();
   }
 
-  aura::Window* clipping_window() { return &(native_host()->clipping_window_); }
-
   void CreateHost() {
     // Create the top level widget.
     toplevel_.reset(new Widget);
@@ -75,7 +55,7 @@
     child_->SetContentsView(test_view);
 
     // Owned by |toplevel|.
-    host_.reset(new NativeViewHostTesting);
+    host_.reset(new NativeViewHost);
     toplevel_->GetRootView()->AddChildView(host_.get());
     host_->Attach(child_->GetNativeView());
   }
@@ -84,13 +64,9 @@
     host_.reset();
   }
 
-  NativeViewHostTesting* ReleaseHost() { return host_.release(); }
-
-  void DestroyTopLevel() { toplevel_.reset(); }
-
  private:
   scoped_ptr<Widget> toplevel_;
-  scoped_ptr<NativeViewHostTesting> host_;
+  scoped_ptr<NativeViewHost> host_;
   scoped_ptr<Widget> child_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewHostAuraTest);
@@ -113,24 +89,15 @@
   CreateHost();
   aura::Window* child_win = child()->GetNativeView();
   EXPECT_EQ(host(), child_win->GetProperty(views::kHostViewKey));
-  EXPECT_EQ(host()->GetWidget()->GetNativeView(),
-            child_win->GetProperty(aura::client::kHostWindowKey));
-  EXPECT_EQ(host(), clipping_window()->GetProperty(views::kHostViewKey));
 
   host()->Detach();
   EXPECT_FALSE(child_win->GetProperty(views::kHostViewKey));
-  EXPECT_FALSE(child_win->GetProperty(aura::client::kHostWindowKey));
-  EXPECT_TRUE(clipping_window()->GetProperty(views::kHostViewKey));
 
   host()->Attach(child_win);
   EXPECT_EQ(host(), child_win->GetProperty(views::kHostViewKey));
-  EXPECT_EQ(host()->GetWidget()->GetNativeView(),
-            child_win->GetProperty(aura::client::kHostWindowKey));
-  EXPECT_EQ(host(), clipping_window()->GetProperty(views::kHostViewKey));
 
   DestroyHost();
   EXPECT_FALSE(child_win->GetProperty(views::kHostViewKey));
-  EXPECT_FALSE(child_win->GetProperty(aura::client::kHostWindowKey));
 }
 
 // Tests that the NativeViewHost reports the cursor set on its native view.
@@ -147,94 +114,4 @@
   DestroyHost();
 }
 
-// Test that destroying the top level widget before destroying the attached
-// NativeViewHost works correctly. Specifically the associated NVH should be
-// destroyed and there shouldn't be any errors.
-TEST_F(NativeViewHostAuraTest, DestroyWidget) {
-  NativeViewHostTesting::ResetDestroyedCount();
-  CreateHost();
-  ReleaseHost();
-  EXPECT_EQ(0, NativeViewHostTesting::destroyed_count());
-  DestroyTopLevel();
-  EXPECT_EQ(1, NativeViewHostTesting::destroyed_count());
-}
-
-// Test that the fast resize path places the clipping and content windows were
-// they are supposed to be.
-TEST_F(NativeViewHostAuraTest, FastResizePath) {
-  CreateHost();
-  toplevel()->SetBounds(gfx::Rect(20, 20, 100, 100));
-
-  // Without fast resize, the clipping window should size to the native view
-  // with the native view positioned at the origin of the clipping window and
-  // the clipping window positioned where the native view was requested.
-  host()->set_fast_resize(false);
-  native_host()->ShowWidget(5, 10, 100, 100);
-  EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(5, 10, 100, 100).ToString(),
-            clipping_window()->bounds().ToString());
-
-  // With fast resize, the native view should remain the same size but be
-  // clipped the requested size.
-  host()->set_fast_resize(true);
-  native_host()->ShowWidget(10, 25, 50, 50);
-  EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(10, 25, 50, 50).ToString(),
-            clipping_window()->bounds().ToString());
-
-  // Turning off fast resize should make the native view start resizing again.
-  host()->set_fast_resize(false);
-  native_host()->ShowWidget(10, 25, 50, 50);
-  EXPECT_EQ(gfx::Rect(0, 0, 50, 50).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(10, 25, 50, 50).ToString(),
-            clipping_window()->bounds().ToString());
-
-  DestroyHost();
-}
-
-// Test installing and uninstalling a clip.
-TEST_F(NativeViewHostAuraTest, InstallClip) {
-  CreateHost();
-  toplevel()->SetBounds(gfx::Rect(20, 20, 100, 100));
-
-  // Without a clip, the clipping window should always be positioned at the
-  // requested coordinates with the native view positioned at the origin of the
-  // clipping window.
-  native_host()->ShowWidget(10, 20, 100, 100);
-  EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(10, 20, 100, 100).ToString(),
-            clipping_window()->bounds().ToString());
-
-  // Clip to the bottom right quarter of the native view.
-  native_host()->InstallClip(60, 70, 50, 50);
-  native_host()->ShowWidget(10, 20, 100, 100);
-  EXPECT_EQ(gfx::Rect(-50, -50, 100, 100).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(60, 70, 50, 50).ToString(),
-            clipping_window()->bounds().ToString());
-
-  // Clip to the center of the native view.
-  native_host()->InstallClip(35, 45, 50, 50);
-  native_host()->ShowWidget(10, 20, 100, 100);
-  EXPECT_EQ(gfx::Rect(-25, -25, 100, 100).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(35, 45, 50, 50).ToString(),
-            clipping_window()->bounds().ToString());
-
-  // Uninstalling the clip should make the clipping window match the native view
-  // again.
-  native_host()->UninstallClip();
-  native_host()->ShowWidget(10, 20, 100, 100);
-  EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
-            host()->native_view()->bounds().ToString());
-  EXPECT_EQ(gfx::Rect(10, 20, 100, 100).ToString(),
-            clipping_window()->bounds().ToString());
-
-  DestroyHost();
-}
-
 }  // namespace views