Cleaning up PointerIdManager and add id re-mapping

components/test_runner/event_sender.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 "components/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 75 matching lines @@
                     int click_count,
                     int modifiers,
                     WebMouseEvent* e) {
   e->type = t;
   e->button = b;
   e->modifiers = modifiers | GetWebMouseEventModifierForButton(b);
   e->x = pos.x;
   e->y = pos.y;
   e->globalX = pos.x;
   e->globalY = pos.y;
+  e->pointerType = blink::WebPointerProperties::PointerType::Mouse;
   e->timeStampSeconds = time_stamp;
   e->clickCount = click_count;
 }
 
 int GetKeyModifier(const std::string& modifier_name) {
   const char* characters = modifier_name.c_str();
   if (!strcmp(characters, "ctrlKey")
 #ifndef __APPLE__
       || !strcmp(characters, "addSelectionKey")
 #endif
@@ skipping 2447 matching lines @@
   last_event_timestamp_ = event.timeStampSeconds;
 
   if (WebPagePopup* popup = view_->pagePopup()) {
     if (!WebInputEvent::isKeyboardEventType(event.type))
       return popup->handleInputEvent(event);
   }
   return view_->handleInputEvent(event);
 }
 
 }  // namespace test_runner