Reland gvr upgrade

chrome/browser/android/vr_shell/vr_controller.cc

 // Copyright 2016 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 "chrome/browser/android/vr_shell/vr_controller.h"
 
 #include <cmath>
 
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
@@ skipping 79 matching lines @@
 }
 
 bool VrController::IsTouchDown() {
   return controller_state_.GetTouchDown();
 }
 
 bool VrController::IsTouchUp() {
   return controller_state_.GetTouchUp();
 }
 
-bool VrController::IsButtonDown(const int32_t button) {
+bool VrController::IsButtonDown(gvr::ControllerButton button) {
   return controller_state_.GetButtonDown(button);
 }
 
-bool VrController::IsButtonUp(const int32_t button) {
+bool VrController::IsButtonUp(gvr::ControllerButton button) {
   return controller_state_.GetButtonUp(button);
 }
 
 bool VrController::IsConnected() {
   return controller_state_.GetConnectionState() == gvr::kControllerConnected;
 }
 
 void VrController::UpdateState() {
   const int32_t old_status = controller_state_.GetApiStatus();
   const int32_t old_connection_state = controller_state_.GetConnectionState();
@@ skipping 174 matching lines @@
       prev_touch_point_.swap(cur_touch_point_);
       *cur_touch_point_ = touch_info_->touch_point;
 
       return true;
     }
   }
   return false;
 }
 
 }  // namespace vr_shell