summaryrefslogtreecommitdiffstats
path: root/athena/env
diff options
context:
space:
mode:
authoroshima <oshima@chromium.org>2014-09-24 10:28:02 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-24 17:28:18 +0000
commit978d46da0e03e72815548c995da800c23f5c61e4 (patch)
tree703da7b5c4456615ffa38c0547ced0908d7363d8 /athena/env
parent85c1b2600e35e1f6adfe021b745fa1495ab50aaa (diff)
downloadchromium_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/env')
-rw-r--r--athena/env/athena_env_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/athena/env/athena_env_unittest.cc b/athena/env/athena_env_unittest.cc
index e852f45..126f87f 100644
--- a/athena/env/athena_env_unittest.cc
+++ b/athena/env/athena_env_unittest.cc
@@ -99,6 +99,8 @@ TEST_F(AthenaEnvTest, TerminatingCallback) {
// Adding empty callback should not fail.
env->AddTerminatingCallback(base::Closure());
env->OnTerminating();
+ env->RemoveTerminatingCallback(cb_1_2);
+ env->RemoveTerminatingCallback(cb_2_1);
}
namespace {