| Index: ui/views/focus/focus_manager_unittest.cc
|
| diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
|
| index 1c4f3502dbd86a0a6bb2d45f182536ffa3e68a30..32555ffcb4aab60d941e353bb00d566553b0bee0 100644
|
| --- a/ui/views/focus/focus_manager_unittest.cc
|
| +++ b/ui/views/focus/focus_manager_unittest.cc
|
| @@ -784,19 +784,23 @@ TEST_F(FocusManagerArrowKeyTraversalTest, ArrowKeyTraversal) {
|
| }
|
|
|
| TEST_F(FocusManagerTest, StoreFocusedView) {
|
| - View view;
|
| - GetFocusManager()->SetFocusedView(&view);
|
| + View* view = new View;
|
| + // Add view to the view hierarchy and make it focusable.
|
| + GetWidget()->GetRootView()->AddChildView(view);
|
| + view->SetFocusable(true);
|
| +
|
| + GetFocusManager()->SetFocusedView(view);
|
| GetFocusManager()->StoreFocusedView(false);
|
| EXPECT_EQ(NULL, GetFocusManager()->GetFocusedView());
|
| EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
|
| - EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
|
| + EXPECT_EQ(view, GetFocusManager()->GetStoredFocusView());
|
|
|
| // Repeat with |true|.
|
| - GetFocusManager()->SetFocusedView(&view);
|
| + GetFocusManager()->SetFocusedView(view);
|
| GetFocusManager()->StoreFocusedView(true);
|
| EXPECT_EQ(NULL, GetFocusManager()->GetFocusedView());
|
| EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
|
| - EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
|
| + EXPECT_EQ(view, GetFocusManager()->GetStoredFocusView());
|
| }
|
|
|
| namespace {
|
|
|