Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8580)

Unified Diff: chrome/test/base/browser_with_test_window_test.cc

Issue 2296973002: Moves ash content specific tests into ash_content_unittests (Closed)
Patch Set: remove GetMessageLoop and merge Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 967d987a9767d7bd18ab6778fd9090bf329c94f7..1a8b6d86a67bd33e569eca19e756df18ece66527 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)

Powered by Google App Engine
This is Rietveld 408576698