Continue threading context through unit tests.

ui/views/test/child_modal_window.cc

Index: ui/views/test/child_modal_window.cc
diff --git a/ui/views/test/child_modal_window.cc b/ui/views/test/child_modal_window.cc
index b3e072af4ea39fea22a18c7dc18c002dae142a95..ebf1ac2662d6834ad878920fed914dcaa2091e78 100644
--- a/ui/views/test/child_modal_window.cc
+++ b/ui/views/test/child_modal_window.cc
@@ -45,9 +45,10 @@ const SkColor kChildColor = SK_ColorWHITE;
 
 }  // namespace
 
-void CreateChildModalParent() {
-  Widget::CreateWindowWithBounds(
-      new ChildModalParent,
+void CreateChildModalParent(gfx::NativeView context) {
+  Widget::CreateWindowWithContextAndBounds(
+      new ChildModalParent(context),
+      context,
       gfx::Rect(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight))->Show();
 }
 
@@ -106,7 +107,7 @@ ui::ModalType ChildModalWindow::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-ChildModalParent::ChildModalParent()
+ChildModalParent::ChildModalParent(gfx::NativeView context)
     : ALLOW_THIS_IN_INITIALIZER_LIST(button_(new NativeTextButton(
           this, ASCIIToUTF16("Show/Hide Child Modal Window")))),
       textfield_(new Textfield),
@@ -114,7 +115,9 @@ ChildModalParent::ChildModalParent()
       modal_parent_(NULL),
       child_(NULL) {
   Widget* widget = new Widget;
-  widget->Init(Widget::InitParams(Widget::InitParams::TYPE_CONTROL));
+  Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
+  params.context = context;
+  widget->Init(params);
   widget->GetRootView()->set_background(
       Background::CreateSolidBackground(kModalParentColor));
   modal_parent_ = widget->GetNativeView();