1 files changed, 12 insertions, 12 deletions

diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc
index 861979e..30f7e85 100644
--- a/chrome/views/focus_manager_unittest.cc
+++ b/chrome/views/focus_manager_unittest.cc
@@ -14,7 +14,6 @@
 #include "chrome/views/background.h"
 #include "chrome/views/border.h"
 #include "chrome/views/checkbox.h"
-#include "chrome/views/container_win.h"
 #include "chrome/views/label.h"
 #include "chrome/views/link.h"
 #include "chrome/views/native_button.h"
@@ -23,6 +22,7 @@
 #include "chrome/views/scroll_view.h"
 #include "chrome/views/tabbed_pane.h"
 #include "chrome/views/text_field.h"
+#include "chrome/views/widget_win.h"
 #include "chrome/views/window.h"
 #include "chrome/views/window_delegate.h"
 #include "SkColor.h"
@@ -114,10 +114,10 @@ class BorderView : public views::NativeControl {
                                         0, 0, width(), height(),
                                         parent_container, NULL, NULL, NULL);
     // Create the view container which is a child of the TabControl.
-    view_container_ = new views::ContainerWin();
-    view_container_->Init(tab_control, gfx::Rect(), false);
-    view_container_->SetContentsView(child_);
-    view_container_->SetFocusTraversableParentView(this);
+    widget_ = new views::WidgetWin();
+    widget_->Init(tab_control, gfx::Rect(), false);
+    widget_->SetContentsView(child_);
+    widget_->SetFocusTraversableParentView(this);
     ResizeContents(tab_control);
     return tab_control;
   }
@@ -132,11 +132,11 @@ class BorderView : public views::NativeControl {
   }
 
   virtual views::RootView* GetContentsRootView() {
-    return view_container_->GetRootView();
+    return widget_->GetRootView();
   }
 
   virtual views::FocusTraversable* GetFocusTraversable() {
-    return view_container_;
+    return widget_;
   }
 
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child) {
@@ -145,7 +145,7 @@ class BorderView : public views::NativeControl {
     if (child == this && is_add) {
       // We have been added to a view hierarchy, update the FocusTraversable
       // parent.
-      view_container_->SetFocusTraversableParent(GetRootView());
+      widget_->SetFocusTraversableParent(GetRootView());
     }
   }
 
@@ -156,18 +156,18 @@ private:
     if (!GetClientRect(tab_control, &content_bounds))
       return;
     TabCtrl_AdjustRect(tab_control, FALSE, &content_bounds);
-    view_container_->MoveWindow(content_bounds.left, content_bounds.top,
+    widget_->MoveWindow(content_bounds.left, content_bounds.top,
       content_bounds.Width(), content_bounds.Height(),
       TRUE);
   }
 
   View* child_;
-  views::ContainerWin* view_container_;
+  views::WidgetWin* widget_;
 
   DISALLOW_EVIL_CONSTRUCTORS(BorderView);
 };
 
-class TestViewWindow : public views::ContainerWin {
+class TestViewWindow : public views::WidgetWin {
  public:
   explicit TestViewWindow(FocusManagerTest* test);
   ~TestViewWindow() { }
@@ -239,7 +239,7 @@ void TestViewWindow::Init() {
   contents_->set_background(
       views::Background::CreateSolidBackground(255, 255, 255));
 
-  ContainerWin::Init(NULL, bounds, true);
+  WidgetWin::Init(NULL, bounds, true);
   SetContentsView(contents_);
 
   views::CheckBox* cb =