Move border_contents_unittest.cc to ui/views/bubble/.

BUG=97248
TEST=none

Review URL: http://codereview.chromium.org/8754003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112326 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests.gypi

@@ -1872,7 +1872,7 @@
         'browser/ui/omnibox/omnibox_view_unittest.cc',
         'browser/ui/panels/auto_hiding_desktop_bar_win_unittest.cc',
         'browser/ui/panels/panel_browser_window_cocoa_unittest.mm',
-	'browser/ui/panels/panel_mouse_watcher_unittest.cc',
+        'browser/ui/panels/panel_mouse_watcher_unittest.cc',
         'browser/ui/search_engines/keyword_editor_controller_unittest.cc',
         'browser/ui/select_file_dialog_unittest.cc',
         'browser/ui/tabs/dock_info_unittest.cc',
@@ -1887,7 +1887,6 @@
         'browser/ui/views/accessibility_event_router_views_unittest.cc',
         'browser/ui/views/bookmarks/bookmark_context_menu_test.cc',
         'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
-        'browser/ui/views/bubble/border_contents_unittest.cc',
         'browser/ui/views/crypto_module_password_dialog_view_unittest.cc',
         'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
         'browser/ui/views/first_run_bubble_unittest.cc',

chrome/browser/ui/views/bubble/border_contents_unittest.cc → ui/views/bubble/border_contents_unittest.cc

@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/bubble/border_contents.h"
+#include "ui/views/bubble/border_contents_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 typedef testing::Test BorderContentsTest;
 
-class TestBorderContents : public BorderContents {
+class TestBorderContentsView : public views::BorderContentsView {
  public:
-  TestBorderContents() {}
+  TestBorderContentsView() {}
 
   void set_monitor_bounds(const gfx::Rect& bounds) {
     monitor_bounds_ = bounds;
   }
 
   views::BubbleBorder* bubble_border() const {
-    return BorderContents::bubble_border();
+    return BorderContentsView::bubble_border();
   }
 
  protected:
@@ -27,13 +27,13 @@ class TestBorderContents : public BorderContents {
  private:
   gfx::Rect monitor_bounds_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestBorderContents);
+  DISALLOW_COPY_AND_ASSIGN(TestBorderContentsView);
 };
 
 // Tests that the arrow is moved appropriately when the info-bubble does not fit
 // the screen.
 TEST_F(BorderContentsTest, BorderContentsSizeAndGetBounds) {
-  TestBorderContents border_contents;
+  TestBorderContentsView border_contents;
   border_contents.Init();
 
   gfx::Insets insets;
@@ -194,7 +194,7 @@ TEST_F(BorderContentsTest, BorderContentsSizeAndGetBounds) {
 // Tests that the arrow is not moved when the info-bubble does not fit the
 // screen but moving it would make matter worse.
 TEST_F(BorderContentsTest, BorderContentsSizeAndGetBoundsDontMoveArrow) {
-  TestBorderContents border_contents;
+  TestBorderContentsView border_contents;
   border_contents.Init();
   gfx::Rect contents_bounds;
   gfx::Rect window_bounds;
@@ -217,7 +217,7 @@ TEST_F(BorderContentsTest, BorderContentsSizeAndGetBoundsDontMoveArrow) {
 
 // Test that the 'allow offscreen' prevents the bubble from moving.
 TEST_F(BorderContentsTest, BorderContentsSizeAndGetBoundsAllowOffscreen) {
-  TestBorderContents border_contents;
+  TestBorderContentsView border_contents;
   border_contents.Init();
   gfx::Rect contents_bounds;
   gfx::Rect window_bounds;

views/views.gyp

@@ -508,6 +508,7 @@
       ],
       'sources': [
         '../ui/views/animation/bounds_animator_unittest.cc',
+        '../ui/views/bubble/border_contents_unittest.cc',
         '../ui/views/bubble/bubble_delegate_unittest.cc',
         '../ui/views/bubble/bubble_frame_view_unittest.cc',
         '../ui/views/controls/combobox/native_combobox_views_unittest.cc',