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

athena/test/athena_test_base.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/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"
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 
 #if defined(USE_X11)
 #include "ui/aura/window_tree_host_x11.h"
 #endif
@@ skipping 23 matching lines @@
 
   helper_.reset(new AthenaTestHelper(&message_loop_));
 #if defined(USE_X11)
   aura::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
   aura::test::InitializeAuraEventGeneratorDelegate();
   helper_->SetUp(context_factory);
 }
 
 void AthenaTestBase::TearDown() {
-  AthenaEnv::Get()->OnTerminating();
-
   teardown_called_ = true;
 
   // Flush the message loop because we have pending release tasks
   // and these tasks if un-executed would upset Valgrind.
   RunAllPendingInMessageLoop();
 
   helper_->TearDown();
   ui::TerminateContextFactoryForTests();
   testing::Test::TearDown();
 }
 
 void AthenaTestBase::RunAllPendingInMessageLoop() {
   helper_->RunAllPendingInMessageLoop();
 }
 
 scoped_ptr<aura::Window> AthenaTestBase::CreateTestWindow(
     aura::WindowDelegate* delegate,
     const gfx::Rect& bounds) {
   scoped_ptr<aura::Window> window(new aura::Window(delegate));
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window->Init(aura::WINDOW_LAYER_SOLID_COLOR);
   aura::client::ParentWindowWithContext(
       window.get(), ScreenManager::Get()->GetContext(), bounds);
   return window.Pass();
 }
 
 }  // namespace test
 }  // namespace athena