diff options
| author | oshima <oshima@chromium.org> | 2014-09-24 10:28:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 17:28:18 +0000 |
| commit | 978d46da0e03e72815548c995da800c23f5c61e4 (patch) | |
| tree | 703da7b5c4456615ffa38c0547ced0908d7363d8 /athena/test | |
| parent | 85c1b2600e35e1f6adfe021b745fa1495ab50aaa (diff) | |
| download | chromium_src-978d46da0e03e72815548c995da800c23f5c61e4.zip chromium_src-978d46da0e03e72815548c995da800c23f5c61e4.tar.gz chromium_src-978d46da0e03e72815548c995da800c23f5c61e4.tar.bz2 | |
rename WidnowManager::GetInstance -> ::Get
call OnTerminating in unit test.
BUG=None
Committed: https://crrev.com/828338e278350941febbfbede2b34d721be6dab1
Cr-Commit-Position: refs/heads/master@{#296348}
Review URL: https://codereview.chromium.org/599683003
Cr-Commit-Position: refs/heads/master@{#296448}
Diffstat (limited to 'athena/test')
| -rw-r--r-- | athena/test/athena_test_base.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/athena/test/athena_test_base.cc b/athena/test/athena_test_base.cc index cbe812c..82a0928 100644 --- a/athena/test/athena_test_base.cc +++ b/athena/test/athena_test_base.cc @@ -4,6 +4,7 @@ #include "athena/test/athena_test_base.h" +#include "athena/env/public/athena_env.h" #include "athena/screen/public/screen_manager.h" #include "athena/test/athena_test_helper.h" #include "ui/aura/client/window_tree_client.h" @@ -47,6 +48,8 @@ void AthenaTestBase::SetUp() { } void AthenaTestBase::TearDown() { + AthenaEnv::Get()->OnTerminating(); + teardown_called_ = true; // Flush the message loop because we have pending release tasks |