Remove app/win/win_util.h,cc etc.

views/window/window_win_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "app/win/win_util.h"
+#include "views/window/window_win.h"
+
 #include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace app {
-namespace win {
+namespace views {
 
-TEST(WinUtilTest, EnsureRectIsVisibleInRect) {
+TEST(WindowWinTest, EnsureRectIsVisibleInRect) {
   gfx::Rect parent_rect(0, 0, 500, 400);
 
   {
     // Child rect x < 0
     gfx::Rect child_rect(-50, 20, 100, 100);
-    EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
+    internal::EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
     EXPECT_EQ(gfx::Rect(10, 20, 100, 100), child_rect);
   }
 
   {
     // Child rect y < 0
     gfx::Rect child_rect(20, -50, 100, 100);
-    EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
+    internal::EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
     EXPECT_EQ(gfx::Rect(20, 10, 100, 100), child_rect);
   }
 
   {
     // Child rect right > parent_rect.right
     gfx::Rect child_rect(450, 20, 100, 100);
-    EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
+    internal::EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
     EXPECT_EQ(gfx::Rect(390, 20, 100, 100), child_rect);
   }
 
   {
     // Child rect bottom > parent_rect.bottom
     gfx::Rect child_rect(20, 350, 100, 100);
-    EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
+    internal::EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
     EXPECT_EQ(gfx::Rect(20, 290, 100, 100), child_rect);
   }
 
   {
     // Child rect width > parent_rect.width
     gfx::Rect child_rect(20, 20, 700, 100);
-    EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
+    internal::EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
     EXPECT_EQ(gfx::Rect(20, 20, 480, 100), child_rect);
   }
 
   {
     // Child rect height > parent_rect.height
     gfx::Rect child_rect(20, 20, 100, 700);
-    EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
+    internal::EnsureRectIsVisibleInRect(parent_rect, &child_rect, 10);
     EXPECT_EQ(gfx::Rect(20, 20, 100, 380), child_rect);
   }
 }
 
-}  // namespace win
-}  // namespace app
+}  // namespace views