Revert "Updated to GVR 1.0 SDK"

device/vr/android/gvr/gvr_device.cc

 // 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.
 
 #include "device/vr/android/gvr/gvr_device.h"
 
 #include <math.h>
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "device/vr/vr_device_manager.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_types.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_types.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 namespace device {
 
 namespace {
 
 static const uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
 
 }  // namespace
@@ skipping 117 matching lines @@
     pose->orientation[1] = 0.0;
     pose->orientation[2] = 0.0;
     pose->orientation[3] = 1.0;
 
     return pose;
   }
 
   gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
   target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
 
-  gvr::Mat4f head_mat =
-      gvr_api->GetHeadSpaceFromStartSpaceRotation(target_time);
-  head_mat = gvr_api->ApplyNeckModel(head_mat, 1.0f);
+  gvr::Mat4f head_mat = gvr_api->GetHeadPoseInStartSpace(target_time);
 
   gfx::Transform inv_transform(
       head_mat.m[0][0], head_mat.m[0][1], head_mat.m[0][2], head_mat.m[0][3],
       head_mat.m[1][0], head_mat.m[1][1], head_mat.m[1][2], head_mat.m[1][3],
       head_mat.m[2][0], head_mat.m[2][1], head_mat.m[2][2], head_mat.m[2][3],
       head_mat.m[3][0], head_mat.m[3][1], head_mat.m[3][2], head_mat.m[3][3]);
 
   gfx::Transform transform;
   if (inv_transform.GetInverse(&transform)) {
     gfx::DecomposedTransform decomposed_transform;
@@ skipping 54 matching lines @@
 }
 
 gvr::GvrApi* GvrDevice::GetGvrApi() {
   if (!delegate_)
     return nullptr;
 
   return delegate_->gvr_api();
 }
 
 }  // namespace device