Refactor VR math off of GVR types, onto gfx types where possible.

chrome/browser/android/vr_shell/non_presenting_gvr_delegate.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 "chrome/browser/android/vr_shell/non_presenting_gvr_delegate.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
@@ skipping 137 matching lines @@
 }
 
 void NonPresentingGvrDelegate::CreateVRDisplayInfo(
     const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
     uint32_t device_id) {
   if (!gvr_api_) {
     callback.Run(device::mojom::VRDisplayInfoPtr(nullptr));
     return;
   }
 
-  gvr::Sizei webvr_size = GvrDelegate::GetRecommendedWebVrSize(gvr_api_.get());
-  DVLOG(1) << __FUNCTION__ << ": resize recommended to " << webvr_size.width
-           << "x" << webvr_size.height;
+  gfx::Size webvr_size = GvrDelegate::GetRecommendedWebVrSize(gvr_api_.get());
+  DVLOG(1) << __FUNCTION__ << ": resize recommended to " << webvr_size.width()
+           << "x" << webvr_size.height();
   callback.Run(
       GvrDelegate::CreateVRDisplayInfo(gvr_api_.get(), webvr_size, device_id));
 }
 
 }  // namespace vr_shell