Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ui / aura / test / aura_test_helper.cc

diff --git a/src/ui/aura/test/aura_test_helper.cc b/src/ui/aura/test/aura_test_helper.cc
index b300dcf..5823922 100644 (file)
--- a/src/ui/aura/test/aura_test_helper.cc
+++ b/src/ui/aura/test/aura_test_helper.cc
@@ -7,7 +7,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
@@ -56,7 +55,7 @@ AuraTestHelper::~AuraTestHelper() {
 void AuraTestHelper::SetUp() {
   setup_called_ = true;
 
-  Env::CreateInstance();
+  Env::CreateInstance(true);
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   EnvTestHelper(Env::GetInstance()).SetInputStateLookup(
@@ -71,8 +70,6 @@ void AuraTestHelper::SetUp() {
   focus_client_.reset(new TestFocusClient);
   client::SetFocusClient(root_window(), focus_client_.get());
   stacking_client_.reset(new TestWindowTreeClient(root_window()));
-  activation_client_.reset(
-      new client::DefaultActivationClient(root_window()));
   capture_client_.reset(new client::DefaultCaptureClient(root_window()));
   test_input_method_.reset(new ui::DummyInputMethod);
   root_window()->SetProperty(
@@ -88,7 +85,6 @@ void AuraTestHelper::TearDown() {
   teardown_called_ = true;
   test_input_method_.reset();
   stacking_client_.reset();
-  activation_client_.reset();
   capture_client_.reset();
   focus_client_.reset();
   client::SetFocusClient(root_window(), NULL);
@@ -98,7 +94,7 @@ void AuraTestHelper::TearDown() {
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, NULL);
 
 #if defined(USE_X11)
-  ui::ResetXCursorCache();
+  ui::test::ResetXCursorCache();
 #endif
 
   ui::ShutdownInputMethodForTesting();