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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.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/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index c729ccc3be89cbd5c5cac2c0aef80168d48fe01d..38a436d1a1945213492aeade467a0dc02b84e3ea 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -17,6 +17,7 @@
#include "ash/content/shell_content_state.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
+#include "ash/test/ash_test_environment_content.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
@@ -281,7 +282,10 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase {
void MultiUserWindowManagerChromeOSTest::SetUp() {
ash_test_helper()->set_test_shell_delegate(new TestShellDelegateChromeOS);
- ash_test_helper()->set_content_state(new ::TestShellContentState);
+ ash::test::AshTestEnvironmentContent* test_environment =
+ static_cast<ash::test::AshTestEnvironmentContent*>(
+ ash_test_helper()->ash_test_environment());
+ test_environment->set_content_state(new ::TestShellContentState);
AshTestBase::SetUp();
session_state_delegate_ = AshTestHelper::GetTestSessionStateDelegate();
profile_manager_.reset(

Powered by Google App Engine
This is Rietveld 408576698