| Index: ash/shelf/shelf_layout_manager_unittest.cc
|
| diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
|
| index 93dfc57bffa5d90c5abbfaea9753d8a0b4d3d8dd..9795e0e525259bd6b3d5debec0047e3f2ea76cdd 100644
|
| --- a/ash/shelf/shelf_layout_manager_unittest.cc
|
| +++ b/ash/shelf/shelf_layout_manager_unittest.cc
|
| @@ -347,7 +347,7 @@ class ShelfLayoutManagerTest : public ash::test::AshTestBase {
|
| window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
|
| window->SetType(aura::client::WINDOW_TYPE_NORMAL);
|
| window->Init(ui::LAYER_TEXTURED);
|
| - SetDefaultParentByPrimaryRootWindow(window);
|
| + ParentWindowInPrimaryRootWindow(window);
|
| return window;
|
| }
|
|
|
|
|