Revert of Don't refcount tracking id -> slot id mapping.

ui/views/controls/menu/menu_controller_unittest.cc

 // 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/run_loop.h"
 #include "ui/aura/scoped_window_targeter.h"
 #include "ui/aura/window.h"
-#include "ui/events/event_handler.h"
 #include "ui/events/event_targeter.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/wm/public/dispatcher_client.h"
 
 #if defined(OS_WIN)
 #include "base/message_loop/message_pump_dispatcher.h"
 #elif defined(USE_X11)
 #include <X11/Xlib.h>
@@ skipping 159 matching lines @@
 
 #if defined(USE_X11)
   void DispatchEscapeAndExpect(MenuController::ExitType exit_type) {
     ui::ScopedXI2Event key_event;
     key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, 0);
     event_source_.Dispatch(key_event);
     EXPECT_EQ(exit_type, controller_->exit_type());
     controller_->exit_type_ = MenuController::EXIT_ALL;
     DispatchEvent();
   }
-
-  void DispatchTouch(int evtype, int id) {
-    ui::ScopedXI2Event touch_event;
-    std::vector<ui::Valuator> valuators;
-    touch_event.InitTouchEvent(1, evtype, id, gfx::Point(10, 10), valuators);
-    event_source_.Dispatch(touch_event);
-    DispatchEvent();
-  }
 #endif
 
   void DispatchEvent() {
 #if defined(USE_X11)
     XEvent xevent;
     memset(&xevent, 0, sizeof(xevent));
     event_source_.Dispatch(&xevent);
 #elif defined(OS_WIN)
     MSG msg;
     memset(&msg, 0, sizeof(MSG));
@@ skipping 60 matching lines @@
     message_loop()->PostTask(
         FROM_HERE,
         base::Bind(&MenuControllerTest::DispatchEscapeAndExpect,
                    base::Unretained(this),
                    MenuController::EXIT_NONE));
     RunMenu(owner.get());
   }
 }
 #endif
 
-#if defined(USE_X11)
-
-class TestEventHandler : public ui::EventHandler {
- public:
-  TestEventHandler() : outstanding_touches_(0) {}
-
-  void OnTouchEvent(ui::TouchEvent* event) override {
-    switch(event->type()) {
-      case ui::ET_TOUCH_PRESSED:
-        outstanding_touches_++;
-        break;
-      case ui::ET_TOUCH_RELEASED:
-      case ui::ET_TOUCH_CANCELLED:
-        outstanding_touches_--;
-        break;
-      default:
-        break;
-    }
-  }
-
-  int outstanding_touches() const { return outstanding_touches_; }
-
- private:
-  int outstanding_touches_;
-};
-
-// Tests that touch event ids are released correctly. See
-// crbug.com/439051 for details. When the ids aren't managed
-// correctly, we get stuck down touches.
-TEST_F(MenuControllerTest, TouchIdsReleasedCorrectly) {
-  scoped_ptr<Widget> owner(CreateOwnerWidget());
-  TestEventHandler test_event_handler;
-  owner->GetNativeWindow()->GetRootWindow()->AddPreTargetHandler(
-      &test_event_handler);
-
-  std::vector<unsigned int> devices;
-  devices.push_back(1);
-  ui::SetUpTouchDevicesForTest(devices);
-
-  DispatchTouch(XI_TouchBegin, 0);
-  DispatchTouch(XI_TouchBegin, 1);
-  DispatchTouch(XI_TouchEnd, 0);
-
-  message_loop()->PostTask(FROM_HERE,
-                           base::Bind(&MenuControllerTest::DispatchTouch,
-                                      base::Unretained(this), XI_TouchEnd, 1));
-
-  message_loop()->PostTask(
-      FROM_HERE,
-      base::Bind(&MenuControllerTest::DispatchEscapeAndExpect,
-                 base::Unretained(this), MenuController::EXIT_OUTERMOST));
-
-  RunMenu(owner.get());
-  EXPECT_EQ(0, test_event_handler.outstanding_touches());
-
-  owner->GetNativeWindow()->GetRootWindow()->RemovePreTargetHandler(
-      &test_event_handler);
-}
-#endif // defined(USE_X11)
-
 }  // namespace views