| Index: ui/aura/shared/compound_event_filter_unittest.cc
|
| diff --git a/ui/aura/shared/compound_event_filter_unittest.cc b/ui/aura/shared/compound_event_filter_unittest.cc
|
| index 57e011449481059e78ac0a083a32ae496e031eab..a74591c8850b67d31feb21763a962a1740145447 100644
|
| --- a/ui/aura/shared/compound_event_filter_unittest.cc
|
| +++ b/ui/aura/shared/compound_event_filter_unittest.cc
|
| @@ -87,10 +87,6 @@ typedef AuraTestBase CompoundEventFilterTest;
|
|
|
| TEST_F(CompoundEventFilterTest, TouchHidesCursor) {
|
| aura::Env::GetInstance()->SetEventFilter(new shared::CompoundEventFilter());
|
| - aura::client::SetActivationClient(root_window(),
|
| - new TestActivationClient(root_window()));
|
| - aura::client::SetCaptureClient(
|
| - root_window(), new shared::RootWindowCaptureClient(root_window()));
|
| TestWindowDelegate delegate;
|
| scoped_ptr<Window> window(CreateTestWindowWithDelegate(&delegate, 1234,
|
| gfx::Rect(5, 5, 100, 100), NULL));
|
| @@ -139,10 +135,6 @@ TEST_F(CompoundEventFilterTest, TouchHidesCursor) {
|
| // Tests that tapping a window gives the window focus.
|
| TEST_F(CompoundEventFilterTest, GestureFocusesWindow) {
|
| aura::Env::GetInstance()->SetEventFilter(new shared::CompoundEventFilter());
|
| - aura::client::SetActivationClient(root_window(),
|
| - new TestActivationClient(root_window()));
|
| - aura::client::SetCaptureClient(
|
| - root_window(), new shared::RootWindowCaptureClient(root_window()));
|
| TestWindowDelegate delegate;
|
| scoped_ptr<Window> window(CreateTestWindowWithDelegate(&delegate, 1234,
|
| gfx::Rect(5, 5, 100, 100), NULL));
|
| @@ -165,10 +157,6 @@ TEST_F(CompoundEventFilterTest, FilterConsumedGesture) {
|
| scoped_ptr<EventFilter> gesture_filter(new ConsumeGestureEventFilter());
|
| compound_filter->AddFilter(gesture_filter.get());
|
| aura::Env::GetInstance()->SetEventFilter(compound_filter);
|
| - aura::client::SetActivationClient(root_window(),
|
| - new TestActivationClient(root_window()));
|
| - aura::client::SetCaptureClient(
|
| - root_window(), new shared::RootWindowCaptureClient(root_window()));
|
| TestWindowDelegate delegate;
|
| scoped_ptr<Window> window(CreateTestWindowWithDelegate(&delegate, 1234,
|
| gfx::Rect(5, 5, 100, 100), NULL));
|
|
|