| Index: ash/test/ash_test_helper.h
|
| diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h
|
| index 9a0424c6544127ea077219de19b22eb5636442d1..9c13eddfeb8e75a1d2ade30f2c86d5a31313849e 100644
|
| --- a/ash/test/ash_test_helper.h
|
| +++ b/ash/test/ash_test_helper.h
|
| @@ -20,10 +20,6 @@ namespace ui {
|
| class ScopedAnimationDurationScaleMode;
|
| } // namespace ui
|
|
|
| -namespace views {
|
| -class ViewsDelegate;
|
| -}
|
| -
|
| namespace wm {
|
| class WMState;
|
| }
|
| @@ -32,6 +28,7 @@ namespace ash {
|
| namespace test {
|
|
|
| class AshTestEnvironment;
|
| +class AshTestViewsDelegate;
|
| class TestScreenshotDelegate;
|
| class TestShellDelegate;
|
| class TestSessionStateDelegate;
|
| @@ -69,6 +66,7 @@ class AshTestHelper {
|
| TestScreenshotDelegate* test_screenshot_delegate() {
|
| return test_screenshot_delegate_;
|
| }
|
| + AshTestViewsDelegate* views_delegate() { return views_delegate_.get(); }
|
|
|
| AshTestEnvironment* ash_test_environment() { return ash_test_environment_; }
|
|
|
| @@ -85,7 +83,7 @@ class AshTestHelper {
|
| TestScreenshotDelegate* test_screenshot_delegate_;
|
|
|
| std::unique_ptr<::wm::WMState> wm_state_;
|
| - std::unique_ptr<views::ViewsDelegate> views_delegate_;
|
| + std::unique_ptr<AshTestViewsDelegate> views_delegate_;
|
|
|
| #if defined(OS_CHROMEOS)
|
| // Check if DBus Thread Manager was initialized here.
|
|
|