Reland gvr upgrade

device/vr/android/gvr/gvr_device_provider.h

 // 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.
 
 #ifndef DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H
 #define DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 26 matching lines @@
   void OnGvrDelegateRemoved();
 
   void SetClient(VRClientDispatcher* client) override;
 
  private:
   void GvrDelegateReady(GvrDelegate* delegate);
   void GvrDelegateRemoved();
 
   std::unique_ptr<VRClientDispatcher> client_;
   std::unique_ptr<GvrDevice> vr_device_;
-  std::unique_ptr<GvrNonPresentingDelegate> non_presenting_delegate_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(GvrDeviceProvider);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_VR_ANDROID_GVR_DEVICE_PROVIDER_H