| Index: chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
|
| diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
|
| index 559678ed142b7012276e1576524909e0d91ce7a6..c05daebb4ad8f93c5494e6bff579c8e96965706f 100644
|
| --- a/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/new_window_delegate.h"
|
| -#include "ash/shell.h"
|
| +#include "ash/common/new_window_delegate.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/wm/window_util.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| @@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
|
| Profile* profile1 = ProfileManager::GetActiveUserProfile();
|
| Browser* browser1 = CreateBrowser(profile1);
|
| // The newly created window should be created for the current active profile.
|
| - ash::Shell::GetInstance()->new_window_delegate()->NewWindow(false);
|
| + ash::WmShell::Get()->new_window_delegate()->NewWindow(false);
|
| EXPECT_EQ(
|
| chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
|
| profile1);
|
| @@ -47,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
|
| Browser* browser2 = CreateBrowser(profile2);
|
| // The newly created window should be created for the current active window's
|
| // profile, which is |profile2|.
|
| - ash::Shell::GetInstance()->new_window_delegate()->NewWindow(false);
|
| + ash::WmShell::Get()->new_window_delegate()->NewWindow(false);
|
| EXPECT_EQ(
|
| chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
|
| profile2);
|
| @@ -55,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
|
| // After activating |browser1|, the newly created window should be created
|
| // against |browser1|'s profile.
|
| browser1->window()->Show();
|
| - ash::Shell::GetInstance()->new_window_delegate()->NewWindow(false);
|
| + ash::WmShell::Get()->new_window_delegate()->NewWindow(false);
|
| EXPECT_EQ(
|
| chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
|
| profile1);
|
| @@ -64,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
|
| // The newly created incoginito window should be created against the current
|
| // active |browser1|'s profile.
|
| browser1->window()->Show();
|
| - ash::Shell::GetInstance()->new_window_delegate()->NewWindow(true);
|
| + ash::WmShell::Get()->new_window_delegate()->NewWindow(true);
|
| EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
|
| ->profile()
|
| ->GetOriginalProfile(),
|
| @@ -73,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
|
| // The newly created incoginito window should be created against the current
|
| // active |browser2|'s profile.
|
| browser2->window()->Show();
|
| - ash::Shell::GetInstance()->new_window_delegate()->NewWindow(true);
|
| + ash::WmShell::Get()->new_window_delegate()->NewWindow(true);
|
| EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
|
| ->profile()
|
| ->GetOriginalProfile(),
|
|
|