Reland gvr upgrade

chrome/browser/android/vr_shell/vr_controller.h

Index: chrome/browser/android/vr_shell/vr_controller.h
diff --git a/chrome/browser/android/vr_shell/vr_controller.h b/chrome/browser/android/vr_shell/vr_controller.h
index f5e9a4774b4f2ca98f268a944eb672164635f38b..e0b03c3e55211a7f6f5bf28ff6332d96f0a23a52 100644
--- a/chrome/browser/android/vr_shell/vr_controller.h
+++ b/chrome/browser/android/vr_shell/vr_controller.h
@@ -7,9 +7,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/android/vr_shell/vr_gesture.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_controller.h"
-#include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/gvr_types.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_controller.h"
+#include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_types.h"
 
 namespace vr_shell {
 
@@ -44,8 +44,8 @@ class VrController {
 
   bool IsTouchUp();
 
-  bool IsButtonUp(const int32_t button);
-  bool IsButtonDown(const int32_t button);
+  bool IsButtonUp(gvr::ControllerButton button);
+  bool IsButtonDown(gvr::ControllerButton button);
 
   bool IsConnected();