Desktop aura: Continue threading context through views.

ui/views/accessible_pane_view_unittest.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/accessible_pane_view.h"
 
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 53 matching lines @@
   not_child_button_.reset(new TextButton(this, label));
 }
 
 View* TestBarView::GetDefaultFocusableChild() {
   return child_button_.get();
 }
 
 TEST_F(AccessiblePaneViewTest, SimpleSetPaneFocus) {
   TestBarView* test_view = new TestBarView();
   scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
   root->AddChildView(test_view);
   widget->Show();
   widget->Activate();
 
   // Set pane focus succeeds, focus on child.
   EXPECT_TRUE(test_view->SetPaneFocusAndFocusDefault());
   EXPECT_EQ(test_view, test_view->GetPaneFocusTraversable());
   EXPECT_EQ(test_view->child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
 
   // Set focus on non child view, focus failed, stays on pane.
   EXPECT_TRUE(test_view->SetPaneFocus(test_view->not_child_button()));
   EXPECT_FALSE(test_view->not_child_button() ==
                test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   EXPECT_EQ(test_view->child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   widget->CloseNow();
   widget.reset();
 }
 
 TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
   TestBarView* test_view = new TestBarView();
   TestBarView* test_view_2 = new TestBarView();
   scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
   root->AddChildView(test_view);
   root->AddChildView(test_view_2);
   widget->Show();
   widget->Activate();
 
   // Set pane focus succeeds, focus on child.
   EXPECT_TRUE(test_view->SetPaneFocusAndFocusDefault());
   EXPECT_EQ(test_view, test_view->GetPaneFocusTraversable());
   EXPECT_EQ(test_view->child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
 
   // Set focus on another test_view, focus move to that pane.
   EXPECT_TRUE(test_view_2->SetPaneFocus(test_view_2->second_child_button()));
   EXPECT_FALSE(test_view->child_button() ==
                test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   EXPECT_EQ(test_view_2->second_child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   widget->CloseNow();
   widget.reset();
 }
 
 TEST_F(AccessiblePaneViewTest, PaneFocusTraversal) {
   TestBarView* test_view = new TestBarView();
   TestBarView* original_test_view = new TestBarView();
   scoped_ptr<Widget> widget(new Widget());
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
   root->AddChildView(original_test_view);
   root->AddChildView(test_view);
   widget->Show();
   widget->Activate();
 
   // Set pane focus on first view.
   EXPECT_TRUE(original_test_view->SetPaneFocus(
@@ skipping 21 matching lines @@
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
 
   // ESC
   test_view->AcceleratorPressed(test_view->escape_key());
   EXPECT_EQ(original_test_view->third_child_button(),
             test_view->GetWidget()->GetFocusManager()->GetFocusedView());
   widget->CloseNow();
   widget.reset();
 }
 }  // namespace views