| Index: ui/aura/test/aura_test_helper.cc
|
| diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
|
| deleted file mode 100644
|
| index 836cf03d0b4d3c1a77383ff0f4eefe55b0a51cb3..0000000000000000000000000000000000000000
|
| --- a/ui/aura/test/aura_test_helper.cc
|
| +++ /dev/null
|
| @@ -1,117 +0,0 @@
|
| -// Copyright (c) 2012 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 "ui/aura/test/aura_test_helper.h"
|
| -
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "base/run_loop.h"
|
| -#include "ui/aura/client/aura_constants.h"
|
| -#include "ui/aura/client/default_capture_client.h"
|
| -#include "ui/aura/client/focus_client.h"
|
| -#include "ui/aura/env.h"
|
| -#include "ui/aura/input_state_lookup.h"
|
| -#include "ui/aura/test/env_test_helper.h"
|
| -#include "ui/aura/test/event_generator_delegate_aura.h"
|
| -#include "ui/aura/test/test_focus_client.h"
|
| -#include "ui/aura/test/test_screen.h"
|
| -#include "ui/aura/test/test_window_tree_client.h"
|
| -#include "ui/aura/window_event_dispatcher.h"
|
| -#include "ui/base/ime/dummy_input_method.h"
|
| -#include "ui/base/ime/input_method_initializer.h"
|
| -#include "ui/compositor/compositor.h"
|
| -#include "ui/compositor/layer_animator.h"
|
| -#include "ui/compositor/scoped_animation_duration_scale_mode.h"
|
| -#include "ui/gfx/screen.h"
|
| -
|
| -#if defined(USE_X11)
|
| -#include "ui/aura/window_tree_host_x11.h"
|
| -#include "ui/base/x/x11_util.h"
|
| -#endif
|
| -
|
| -namespace aura {
|
| -namespace test {
|
| -
|
| -AuraTestHelper::AuraTestHelper(base::MessageLoopForUI* message_loop)
|
| - : setup_called_(false),
|
| - teardown_called_(false),
|
| - owns_host_(false) {
|
| - DCHECK(message_loop);
|
| - message_loop_ = message_loop;
|
| - // Disable animations during tests.
|
| - zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
|
| - ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
|
| -#if defined(USE_X11)
|
| - test::SetUseOverrideRedirectWindowByDefault(true);
|
| -#endif
|
| - InitializeAuraEventGeneratorDelegate();
|
| -}
|
| -
|
| -AuraTestHelper::~AuraTestHelper() {
|
| - CHECK(setup_called_)
|
| - << "AuraTestHelper::SetUp() never called.";
|
| - CHECK(teardown_called_)
|
| - << "AuraTestHelper::TearDown() never called.";
|
| -}
|
| -
|
| -void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
|
| - setup_called_ = true;
|
| -
|
| - Env::CreateInstance(true);
|
| - Env::GetInstance()->set_context_factory(context_factory);
|
| - // Unit tests generally don't want to query the system, rather use the state
|
| - // from RootWindow.
|
| - EnvTestHelper(Env::GetInstance()).SetInputStateLookup(
|
| - scoped_ptr<InputStateLookup>());
|
| -
|
| - ui::InitializeInputMethodForTesting();
|
| -
|
| - gfx::Size host_size(800, 600);
|
| - test_screen_.reset(TestScreen::Create(host_size));
|
| - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
|
| - host_.reset(test_screen_->CreateHostForPrimaryDisplay());
|
| -
|
| - focus_client_.reset(new TestFocusClient);
|
| - client::SetFocusClient(root_window(), focus_client_.get());
|
| - stacking_client_.reset(new TestWindowTreeClient(root_window()));
|
| - capture_client_.reset(new client::DefaultCaptureClient(root_window()));
|
| - test_input_method_.reset(new ui::DummyInputMethod);
|
| - root_window()->SetProperty(
|
| - client::kRootWindowInputMethodKey,
|
| - test_input_method_.get());
|
| -
|
| - root_window()->Show();
|
| - // Ensure width != height so tests won't confuse them.
|
| - host()->SetBounds(gfx::Rect(host_size));
|
| -}
|
| -
|
| -void AuraTestHelper::TearDown() {
|
| - teardown_called_ = true;
|
| - test_input_method_.reset();
|
| - stacking_client_.reset();
|
| - capture_client_.reset();
|
| - focus_client_.reset();
|
| - client::SetFocusClient(root_window(), NULL);
|
| - host_.reset();
|
| - ui::GestureRecognizer::Reset();
|
| - test_screen_.reset();
|
| - gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
|
| -
|
| -#if defined(USE_X11)
|
| - ui::test::ResetXCursorCache();
|
| -#endif
|
| -
|
| - ui::ShutdownInputMethodForTesting();
|
| -
|
| - Env::DeleteInstance();
|
| -}
|
| -
|
| -void AuraTestHelper::RunAllPendingInMessageLoop() {
|
| - // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
|
| - // use run_loop.QuitClosure().
|
| - base::RunLoop run_loop;
|
| - run_loop.RunUntilIdle();
|
| -}
|
| -
|
| -} // namespace test
|
| -} // namespace aura
|
|
|