Desktop aura: Continue threading context through views.

ui/views/widget/native_widget_unittest.cc

Index: ui/views/widget/native_widget_unittest.cc
diff --git a/ui/views/widget/native_widget_unittest.cc b/ui/views/widget/native_widget_unittest.cc
index 1e2d197e9300e1c8ab02aa99f23c46ab01ffaa49..133f8be04a5fe702c31211aac916ef536457ce04 100644
--- a/ui/views/widget/native_widget_unittest.cc
+++ b/ui/views/widget/native_widget_unittest.cc
@@ -7,7 +7,6 @@
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/native_widget_private.h"
-#include "ui/views/widget/native_widget_test_utils.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
@@ -38,17 +37,36 @@ class NativeWidgetTest : public ViewsTestBase {
   NativeWidgetTest() {}
   virtual ~NativeWidgetTest() {}
 
+  internal::NativeWidgetPrivate* CreateNativeWidgetOfType(
+      Widget::InitParams::Type type) {
+    Widget* widget = new Widget;
+    Widget::InitParams params = CreateParams(type);
+    params.ownership = views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET;
+    params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL.
+    params.bounds = gfx::Rect(10, 10, 200, 200);
+    widget->Init(params);
+    return widget->native_widget_private();
+  }
+
+  internal::NativeWidgetPrivate* CreateNativeWidget() {
+    return CreateNativeWidgetOfType(Widget::InitParams::TYPE_POPUP);
+  }
+
+  internal::NativeWidgetPrivate* CreateNativeSubWidget() {
+    return CreateNativeWidgetOfType(Widget::InitParams::TYPE_CONTROL);
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetTest);
 };
 
 TEST_F(NativeWidgetTest, CreateNativeWidget) {
-  ScopedTestWidget widget(internal::CreateNativeWidget());
+  ScopedTestWidget widget(CreateNativeWidget());
   EXPECT_TRUE(widget->GetWidget()->GetNativeView() != NULL);
 }
 
 TEST_F(NativeWidgetTest, GetNativeWidgetForNativeView) {
-  ScopedTestWidget widget(internal::CreateNativeWidget());
+  ScopedTestWidget widget(CreateNativeWidget());
   EXPECT_EQ(widget.get(),
             internal::NativeWidgetPrivate::GetNativeWidgetForNativeView(
                 widget->GetWidget()->GetNativeView()));
@@ -56,7 +74,7 @@ TEST_F(NativeWidgetTest, GetNativeWidgetForNativeView) {
 
 // |widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget1) {
-  ScopedTestWidget widget(internal::CreateNativeWidget());
+  ScopedTestWidget widget(CreateNativeWidget());
   EXPECT_EQ(widget.get(),
             internal::NativeWidgetPrivate::GetTopLevelNativeWidget(
                 widget->GetWidget()->GetNativeView()));
@@ -64,15 +82,14 @@ TEST_F(NativeWidgetTest, GetTopLevelNativeWidget1) {
 
 // |toplevel_widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget2) {
-  ScopedTestWidget toplevel_widget(internal::CreateNativeWidget());
+  ScopedTestWidget toplevel_widget(CreateNativeWidget());
 
   // |toplevel_widget| owns |child_host|.
   NativeViewHost* child_host = new NativeViewHost;
   toplevel_widget->GetWidget()->SetContentsView(child_host);
 
   // |child_host| owns |child_widget|.
-  internal::NativeWidgetPrivate* child_widget =
-      internal::CreateNativeSubWidget();
+  internal::NativeWidgetPrivate* child_widget = CreateNativeSubWidget();
   child_host->Attach(child_widget->GetWidget()->GetNativeView());
 
   EXPECT_EQ(toplevel_widget.get(),