Rework the way Widget::Init works:

views/widget/native_widget_test_utils_gtk.cc

Index: views/widget/native_widget_test_utils_gtk.cc
===================================================================
--- views/widget/native_widget_test_utils_gtk.cc	(revision 83020)
+++ views/widget/native_widget_test_utils_gtk.cc	(working copy)
@@ -5,7 +5,8 @@
 #include "views/widget/native_widget_test_utils.h"
 
 #include "views/view.h"
-#include "views/widget/widget_gtk.h"
+#include "views/widget/native_widget.h"
+#include "views/widget/widget.h"
 
 namespace views {
 namespace internal {
@@ -15,18 +16,22 @@
 }
 
 NativeWidget* CreateNativeWidgetWithContents(View* contents_view) {
-  WidgetGtk* widget = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
-  widget->set_delete_on_destroy(false);
-  widget->Init(NULL, gfx::Rect(10, 10, 200, 200));
-  return widget;
+  Widget* widget = Widget::CreateWidget();
+  Widget::CreateParams params(Widget::CreateParams::TYPE_WINDOW);
+  params.delete_on_destroy = false;
+  params.bounds = gfx::Rect(10, 10, 200, 200);
+  widget->Init(params);
+  return widget->native_widget();
 }
 
 NativeWidget* CreateNativeWidgetWithParent(NativeWidget* parent) {
-  WidgetGtk* widget = new WidgetGtk(WidgetGtk::TYPE_CHILD);
-  widget->set_delete_on_destroy(false);
-  widget->Init(parent ? parent->GetWidget()->GetNativeView() : NULL,
-               gfx::Rect(10, 10, 200, 200));
-  return widget;
+  Widget* widget = Widget::CreateWidget();
+  Widget::CreateParams params(Widget::CreateParams::TYPE_CONTROL);
+  params.delete_on_destroy = false;
+  params.parent = parent ? parent->GetWidget()->GetNativeView() : NULL;
+  params.bounds = gfx::Rect(10, 10, 200, 200);
+  widget->Init(params);
+  return widget->native_widget();
 }
 
 }  // namespace internal