Clean up some VrShell threading issues and remove unnecessary WeakPtr types.

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 d6eca677cc1cc5e299973db94a1e16e4804fa930..65e0d1f668563fd6a3204950926006517f05cba2 100644
--- a/device/vr/android/gvr/gvr_gamepad_data_fetcher.h
+++ b/device/vr/android/gvr/gvr_gamepad_data_fetcher.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/memory/weak_ptr.h"
 #include "device/gamepad/gamepad_data_fetcher.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"
@@ -20,14 +19,13 @@ class GvrGamepadDataFetcher : public GamepadDataFetcher {
  public:
   class Factory : public GamepadDataFetcherFactory {
    public:
-    Factory(const base::WeakPtr<GvrDelegate>& delegate,
-            unsigned int display_id);
+    Factory(GvrDelegate* delegate, unsigned int display_id);
     ~Factory() override;
     std::unique_ptr<GamepadDataFetcher> CreateDataFetcher() override;
     GamepadSource source() override;
 
    private:
-    base::WeakPtr<GvrDelegate> delegate_;
+    GvrDelegate* delegate_;
     unsigned int display_id_;
   };