Reland gvr upgrade

chrome/browser/android/vr_shell/vr_controller.cc

Index: chrome/browser/android/vr_shell/vr_controller.cc
diff --git a/chrome/browser/android/vr_shell/vr_controller.cc b/chrome/browser/android/vr_shell/vr_controller.cc
index 33cdbe93c85ee05ebc61a3c710aa71e6a1d768bf..aec39c83471261d53c3c6806841a6c7f0aa915b8 100644
--- a/chrome/browser/android/vr_shell/vr_controller.cc
+++ b/chrome/browser/android/vr_shell/vr_controller.cc
@@ -97,11 +97,11 @@ 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);
 }