Continue threading context through unit tests.

ui/views/test/child_modal_window.cc

 // Copyright (c) 2012 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 "ui/views/test/child_modal_window.h"
 
 #include "base/utf_string_conversions.h"  // ASCIIToUTF16
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ skipping 27 matching lines @@
 const int kChildTextfieldLeft = 20;
 const int kChildTextfieldTop = 50;
 const int kChildTextfieldWidth = 290;
 const int kChildTextfieldHeight = 35;
 
 const SkColor kModalParentColor = SK_ColorWHITE;
 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();
 }
 
 
 class ChildModalWindow : public WidgetDelegateView {
  public:
   ChildModalWindow();
   virtual ~ChildModalWindow();
 
  private:
@@ skipping 38 matching lines @@
 }
 
 bool ChildModalWindow::CanResize() const {
   return false;
 }
 
 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),
       host_(new NativeViewHost),
       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();
   widget->GetNativeView()->SetName("ModalParent");
   AddChildView(button_);
   AddChildView(textfield_);
   AddChildView(host_);
 }
 
 ChildModalParent::~ChildModalParent() {
@@ skipping 76 matching lines @@
 
 void ChildModalParent::OnWidgetClosing(Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace views