| Index: chrome/test/base/browser_with_test_window_test.cc
|
| diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc
|
| index 3ceadfb6f0339da8abe9814b1cea84bb5866b2ad..fcb41806c4f272e66e8ce5da61ece4b97bdbeb90 100644
|
| --- a/chrome/test/base/browser_with_test_window_test.cc
|
| +++ b/chrome/test/base/browser_with_test_window_test.cc
|
| @@ -24,6 +24,7 @@
|
|
|
| #if defined(OS_CHROMEOS)
|
| #include "ash/test/ash_test_helper.h"
|
| +#include "chrome/test/base/ash_test_environment_chrome.h"
|
| #elif defined(TOOLKIT_VIEWS)
|
| #include "ui/views/test/scoped_views_test_helper.h"
|
| #endif
|
| @@ -54,8 +55,9 @@ void BrowserWithTestWindowTest::SetUp() {
|
| // TODO(jamescook): Windows Ash support. This will require refactoring
|
| // AshTestHelper and AuraTestHelper so they can be used at the same time,
|
| // perhaps by AshTestHelper owning an AuraTestHelper.
|
| - ash_test_helper_.reset(new ash::test::AshTestHelper(
|
| - base::MessageLoopForUI::current()));
|
| + ash_test_environment_ = base::MakeUnique<AshTestEnvironmentChrome>();
|
| + ash_test_helper_.reset(
|
| + new ash::test::AshTestHelper(ash_test_environment_.get()));
|
| ash_test_helper_->SetUp(true,
|
| ash::MaterialDesignController::Mode::UNINITIALIZED);
|
| #elif defined(TOOLKIT_VIEWS)
|
|
|