Rework the way Widget::Init works:

views/widget/widget_win_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 "views/widget/widget_win.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 25 matching lines @@
   }
 
  private:
   MessageLoopForUI message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetWinTest);
 };
 
 
 WidgetWin* WidgetWinTest::CreateWidgetWin() {
-  scoped_ptr<WidgetWin> widget(new WidgetWin());
+  scoped_ptr<Widget> widget(Widget::CreateWidget());
   Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
   params.delete_on_destroy = false;
-  widget->SetCreateParams(params);
-  widget->Init(NULL, gfx::Rect(50, 50, 650, 650));
-  return widget.release();
+  params.bounds = gfx::Rect(50, 50, 650, 650);
+  widget->Init(params);
+  return static_cast<WidgetWin*>(widget.release()->native_widget());
 }
 
 TEST_F(WidgetWinTest, ZoomWindow) {
   scoped_ptr<WidgetWin> window(CreateWidgetWin());
   window->ShowWindow(SW_HIDE);
   EXPECT_FALSE(window->IsActive());
   window->ShowWindow(SW_MAXIMIZE);
   EXPECT_TRUE(window->IsZoomed());
   window->CloseNow();
 }
@@ skipping 12 matching lines @@
   // Verify that setting the bounds of a zoomed window will unzoom it and not
   // cause it to be activated.
   window->SetBounds(gfx::Rect(50, 50, 650, 650));
   EXPECT_FALSE(window->IsZoomed());
   EXPECT_FALSE(window->IsActive());
 
   // Cleanup.
   window->CloseNow();
   window2->CloseNow();
 }