[Athena, Cleanup] rename WidnowManager::GetInstance -> ::Get

athena/env/athena_env_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/env/public/athena_env.h"
 
 #include "athena/test/athena_test_base.h"
 #include "base/bind.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
@@ skipping 81 matching lines @@
   callback_2.Reset();
   env->AddTerminatingCallback(cb_1_2);
   env->OnTerminating();
   EXPECT_EQ(0, callback_1.on_terminating_count());
   EXPECT_EQ(1, callback_1.on_terminating_2_count());
   EXPECT_EQ(1, callback_2.on_terminating_count());
 
   // Adding empty callback should not fail.
   env->AddTerminatingCallback(base::Closure());
   env->OnTerminating();
+  env->RemoveTerminatingCallback(cb_1_2);
+  env->RemoveTerminatingCallback(cb_2_1);
 }
 
 namespace {
 
 class AthenaShutdownTest : public test::AthenaTestBase {
  public:
   AthenaShutdownTest() {}
   virtual ~AthenaShutdownTest() {}
 
   virtual void TearDown() {
     test::AthenaTestBase::TearDown();
     ASSERT_NE(
         gfx::Display::kInvalidDisplayID,
         gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AthenaShutdownTest);
 };
 
 }  // namespace
 
 // gfx::Screen should be accessible after shutdown.
 TEST_F(AthenaShutdownTest, Shutdown) {
 }
 
 }  // namespace athena