Refactor GVR controller gamepad API integration

device/vr/android/gvr/gvr_gamepad_data_fetcher.h

Index: device/vr/android/gvr/gvr_gamepad_data_fetcher.h
diff --git a/device/vr/android/gvr/gvr_gamepad_data_fetcher.h b/device/vr/android/gvr/gvr_gamepad_data_fetcher.h
index 35f3d9396e3c2c5d4674dcfb57b23dbbd8e32704..816046e51b90461d2f42bff5f0ce92e4477f5970 100644
--- a/device/vr/android/gvr/gvr_gamepad_data_fetcher.h
+++ b/device/vr/android/gvr/gvr_gamepad_data_fetcher.h
@@ -8,9 +8,8 @@
 #include <string>
 
 #include "device/gamepad/gamepad_data_fetcher.h"
+#include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
 #include "device/vr/vr_export.h"
-#include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_controller.h"
-#include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 
 namespace device {
 
@@ -18,17 +17,17 @@ class DEVICE_VR_EXPORT GvrGamepadDataFetcher : public GamepadDataFetcher {
  public:
   class Factory : public GamepadDataFetcherFactory {
    public:
-    Factory(gvr_context* context, unsigned int display_id);
+    Factory(GvrGamepadDataProvider*, unsigned int display_id);
     ~Factory() override;
     std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override;
     GamepadSource source() override;
 
    private:
-    gvr_context* context_;
+    GvrGamepadDataProvider* data_provider_;
     unsigned int display_id_;
   };
 
-  GvrGamepadDataFetcher(gvr_context* context, unsigned int display_id);
+  GvrGamepadDataFetcher(GvrGamepadDataProvider*, unsigned int display_id);
   ~GvrGamepadDataFetcher() override;
 
   GamepadSource source() override;
@@ -37,11 +36,12 @@ class DEVICE_VR_EXPORT GvrGamepadDataFetcher : public GamepadDataFetcher {
   void PauseHint(bool paused) override;
   void OnAddedToProvider() override;
 
+  // Called from GvrGamepadDataProvider
+  void SetGamepadData(GvrGamepadData);
+
  private:
-  std::unique_ptr<gvr::ControllerApi> controller_api_;
-  gvr::ControllerState controller_state_;
-  gvr::ControllerHandedness handedness_;
   unsigned int display_id_;
+  GvrGamepadData gamepad_data_;
 
   DISALLOW_COPY_AND_ASSIGN(GvrGamepadDataFetcher);
 };