Moving athena/test to athena/test/base

athena/test/athena_test_base.cc

Index: athena/test/athena_test_base.cc
diff --git a/athena/test/athena_test_base.cc b/athena/test/athena_test_base.cc
deleted file mode 100644
index 82a092865fa1422657e9c5878645770f6557e646..0000000000000000000000000000000000000000
--- a/athena/test/athena_test_base.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-// 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
-
-namespace athena {
-namespace test {
-
-AthenaTestBase::AthenaTestBase()
-    : setup_called_(false), teardown_called_(false) {
-}
-
-AthenaTestBase::~AthenaTestBase() {
-  CHECK(setup_called_)
-      << "You have overridden SetUp but never called super class's SetUp";
-  CHECK(teardown_called_)
-      << "You have overridden TearDown but never called super class's TearDown";
-}
-
-void AthenaTestBase::SetUp() {
-  setup_called_ = true;
-  testing::Test::SetUp();
-
-  // The ContextFactory must exist before any Compositors are created.
-  bool enable_pixel_output = false;
-  ui::ContextFactory* context_factory =
-      ui::InitializeContextFactoryForTests(enable_pixel_output);
-
-  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