diff options
| author | ben <ben@chromium.org> | 2015-10-05 12:14:32 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-05 19:15:37 +0000 |
| commit | 9307244929dc1676f0a1f4699fb2c9b3539b9545 (patch) | |
| tree | f0d53ddbdd5938147d3105b09586f72060700069 /ash/test/ash_test_helper.cc | |
| parent | 9061e0756c36fbf65b90c652fdb1ccc4c832ac62 (diff) | |
| download | chromium_src-9307244929dc1676f0a1f4699fb2c9b3539b9545.zip chromium_src-9307244929dc1676f0a1f4699fb2c9b3539b9545.tar.gz chromium_src-9307244929dc1676f0a1f4699fb2c9b3539b9545.tar.bz2 | |
Extract content-specific aspects of SessionStateDelegate onto ShellContentState.
R=sky@chromium.org
http://crbug.com/332504
Review URL: https://codereview.chromium.org/1377343003
Cr-Commit-Position: refs/heads/master@{#352381}
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 562759c..336d9c7 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -48,8 +48,9 @@ namespace test { AshTestHelper::AshTestHelper(base::MessageLoopForUI* message_loop) : message_loop_(message_loop), - test_shell_delegate_(NULL), - test_screenshot_delegate_(NULL) { + test_shell_delegate_(nullptr), + test_screenshot_delegate_(nullptr), + content_state_(nullptr) { CHECK(message_loop_); #if defined(OS_CHROMEOS) dbus_thread_manager_initialized_ = false; @@ -99,7 +100,8 @@ void AshTestHelper::SetUp(bool start_session) { // created in AshTestBase tests. chromeos::CrasAudioHandler::InitializeForTesting(); #endif - ShellContentState::SetInstance(new TestShellContentState); + ShellContentState::SetInstance(content_state_ ? content_state_ + : new TestShellContentState); ShellInitParams init_params; init_params.delegate = test_shell_delegate_; |