ui: Remove TouchStatus in favour of EventResult.

ui/aura/shared/compound_event_filter_unittest.cc

 // 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/shared/compound_event_filter.h"
 
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
@@ skipping 55 matching lines @@
   // Overridden from EventFilter.
   virtual bool PreHandleKeyEvent(Window* target, ui::KeyEvent* event) OVERRIDE {
     return false;
   }
 
   virtual bool PreHandleMouseEvent(Window* target,
                                    ui::MouseEvent* event) OVERRIDE {
     return false;
   }
 
-  virtual ui::TouchStatus PreHandleTouchEvent(
+  virtual ui::EventResult PreHandleTouchEvent(
       Window* target,
       ui::TouchEvent* event) OVERRIDE {
-    return ui::TOUCH_STATUS_UNKNOWN;
+    return ui::ER_UNHANDLED;
   }
 
   virtual ui::EventResult PreHandleGestureEvent(
       Window* target,
       ui::GestureEvent* event) OVERRIDE {
     return ui::ER_CONSUMED;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ConsumeGestureEventFilter);
 };
@@ skipping 95 matching lines @@
   EventGenerator generator(root_window(), gfx::Point(50, 50));
   generator.PressTouch();
   EXPECT_FALSE(window->HasFocus());
 
   compound_filter->RemoveFilter(gesture_filter.get());
   aura::Env::GetInstance()->AddPreTargetHandler(compound_filter.get());
 }
 
 }  // namespace test
 }  // namespace aura