| Index: ash/shell_unittest.cc
|
| diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
|
| index b762abb5f636a62d17983de10e266107099a3472..8885320cd5c267e9c4f0210782580abe2a67289a 100644
|
| --- a/ash/shell_unittest.cc
|
| +++ b/ash/shell_unittest.cc
|
| @@ -359,7 +359,7 @@ TEST_F(ShellTest, ToggleAutoHide) {
|
| window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
| window->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| window->Init(ui::LAYER_TEXTURED);
|
| - window->SetParent(NULL);
|
| + SetDefaultParentByPrimaryRootWindow(window.get());
|
| window->Show();
|
| wm::ActivateWindow(window.get());
|
|
|
|
|