| Index: ash/shell_unittest.cc
|
| diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
|
| index 79c64f9b7856c539da06931cb458ad4fc12fb020..994f45643e21aeafa72b34f164b2bb92a92270b9 100644
|
| --- a/ash/shell_unittest.cc
|
| +++ b/ash/shell_unittest.cc
|
| @@ -477,7 +477,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);
|
| - SetDefaultParentByPrimaryRootWindow(window.get());
|
| + ParentWindowInPrimaryRootWindow(window.get());
|
| window->Show();
|
| wm::ActivateWindow(window.get());
|
|
|
|
|