Rework the way Widget::Init works:

views/focus/focus_manager_unittest.cc

 // 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 272 matching lines @@
 
   virtual FocusTraversable* GetFocusTraversable() {
     return widget_->GetRootView();
   }
 
   virtual void ViewHierarchyChanged(bool is_add, View *parent, View *child) {
     NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
 
     if (child == this && is_add) {
       if (!widget_) {
-        widget_ = Widget::CreateWidget(
-            Widget::CreateParams(Widget::CreateParams::TYPE_CONTROL));
+        widget_ = Widget::CreateWidget();
+        Widget::CreateParams params(Widget::CreateParams::TYPE_CONTROL);
 #if defined(OS_WIN)
-        gfx::NativeView parent_native_view =
-            parent->GetRootView()->GetWidget()->GetNativeView();
+        params.parent = parent->GetRootView()->GetWidget()->GetNativeView();
 #elif defined(TOOLKIT_USES_GTK)
-        gfx::NativeView parent_native_view = native_view();
+        params.parent = native_view();
 #endif
-        widget_->Init(parent_native_view, gfx::Rect(0, 0, 0, 0));
+        widget_->Init(params);
         widget_->SetFocusTraversableParentView(this);
         widget_->SetContentsView(child_);
       }
 
       // We have been added to a view hierarchy, attach the native view.
       Attach(widget_->GetNativeView());
       // Also update the FocusTraversable parent so the focus traversal works.
       widget_->GetRootView()->SetFocusTraversableParent(
           GetWidget()->GetFocusTraversable());
     }
@@ skipping 1284 matching lines @@
   ATOM atom = RegisterClassEx(&class_ex);
   ASSERT_TRUE(atom);
 
   // Create a native dialog window.
   HWND hwnd = CreateWindowEx(0, class_ex.lpszClassName, NULL,
                              WS_OVERLAPPEDWINDOW, 0, 0, 200, 200,
                              NULL, NULL, NULL, NULL);
   ASSERT_TRUE(hwnd);
 
   // Create a view window parented to native dialog.
-  WidgetWin widget1;
+  scoped_ptr<Widget> widget1(Widget::CreateWidget());
   Widget::CreateParams params(Widget::CreateParams::TYPE_CONTROL);
   params.delete_on_destroy = false;
-  widget1.SetCreateParams(params);
-  widget1.set_window_style(WS_CHILD);
-  widget1.Init(hwnd, gfx::Rect(0, 0, 100, 100));
+  params.parent = hwnd;
+  params.bounds = gfx::Rect(0, 0, 100, 100);
+  widget1->Init(params);
 
   // Get the focus manager directly from the first window.  Should exist
   // because the first window is the root widget.
-  views::FocusManager* focus_manager_member1 = widget1.GetFocusManager();
+  views::FocusManager* focus_manager_member1 = widget1->GetFocusManager();
   EXPECT_TRUE(focus_manager_member1);
 
   // Create another view window parented to the first view window.
-  WidgetWin widget2;
-  widget2.SetCreateParams(params);
-  widget2.Init(widget1.GetNativeView(), gfx::Rect(0, 0, 100, 100));
+  scoped_ptr<Widget> widget2(Widget::CreateWidget());
+  params.parent = widget1->GetNativeView();
+  widget2->Init(params);
 
   // Get the focus manager directly from the second window. Should return the
   // first window's focus manager.
-  views::FocusManager* focus_manager_member2 = widget2.GetFocusManager();
+  views::FocusManager* focus_manager_member2 = widget2->GetFocusManager();
   EXPECT_EQ(focus_manager_member2, focus_manager_member1);
 
   // Get the focus manager indirectly using the first window handle. Should
   // return the first window's focus manager.
   views::FocusManager* focus_manager_indirect =
       views::FocusManager::GetFocusManagerForNativeView(
-          widget1.GetNativeView());
+          widget1->GetNativeView());
   EXPECT_EQ(focus_manager_indirect, focus_manager_member1);
 
   // Get the focus manager indirectly using the second window handle. Should
   // return the first window's focus manager.
   focus_manager_indirect =
       views::FocusManager::GetFocusManagerForNativeView(
-          widget2.GetNativeView());
+          widget2->GetNativeView());
   EXPECT_EQ(focus_manager_indirect, focus_manager_member1);
 
   DestroyWindow(hwnd);
 }
 #endif
 
 #if defined(OS_CHROMEOS)
 class FocusManagerDtorTest : public FocusManagerTest {
  protected:
   typedef std::vector<std::string> DtorTrackVector;
@@ skipping 86 matching lines @@
   // Focus manager should be the last one to destruct.
   ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
 
   // Clear window_ so that we don't try to close it again.
   window_ = NULL;
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace views