Remove the deprecated UpdateSourceURL() API in VR

Bug: 892358
Change-Id: If4ab72c31909c6bd5ccde0db83ad6c9e61ea831a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1525045
Commit-Queue: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Reviewed-by: Bill Orr <billorr@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#647372}

services/metrics/public/cpp/ukm_recorder.h

diff --git a/services/metrics/public/cpp/ukm_recorder.h b/services/metrics/public/cpp/ukm_recorder.h
index c547e09..2083c2d 100644
--- a/services/metrics/public/cpp/ukm_recorder.h
+++ b/services/metrics/public/cpp/ukm_recorder.h
@@ -29,7 +29,6 @@
 
 namespace blink {
 class Document;
-class NavigatorVR;
 }  // namespace blink
 
 namespace cc {
@@ -112,7 +111,6 @@
   friend TestRecordingHelper;
   friend autofill::TestAutofillClient;
   friend blink::Document;
-  friend blink::NavigatorVR;
   friend cc::UkmManager;
   friend content::CrossSiteDocumentResourceHandler;
   friend content::PluginServiceImpl;

third_party/blink/renderer/modules/vr/navigator_vr.cc

diff --git a/third_party/blink/renderer/modules/vr/navigator_vr.cc b/third_party/blink/renderer/modules/vr/navigator_vr.cc
index 1fcb431..c96fae37 100644
--- a/third_party/blink/renderer/modules/vr/navigator_vr.cc
+++ b/third_party/blink/renderer/modules/vr/navigator_vr.cc
@@ -104,7 +104,7 @@
       return nullptr;
     }
 
-    xr_ = XR::Create(*frame, ukm_source_id_);
+    xr_ = XR::Create(*frame, GetSourceId());
   }
   return xr_;
 }
@@ -131,7 +131,7 @@
   if (!did_log_getVRDisplays_ && GetDocument()->IsInMainFrame()) {
     did_log_getVRDisplays_ = true;
 
-    ukm::builders::XR_WebXR(GetDocument()->UkmSourceID())
+    ukm::builders::XR_WebXR(GetSourceId())
         .SetDidRequestAvailableDevices(1)
         .Record(GetDocument()->UkmRecorder());
   }
@@ -201,18 +201,9 @@
 NavigatorVR::NavigatorVR(Navigator& navigator)
     : Supplement<Navigator>(navigator),
       FocusChangedObserver(navigator.GetFrame()->GetPage()),
-      ukm_source_id_(ukm::UkmRecorder::GetNewSourceID()) {
+      ukm_source_id_(GetDocument()->UkmSourceID()) {
   navigator.GetFrame()->DomWindow()->RegisterEventListenerObserver(this);
   FocusedFrameChanged();
-
-  if (navigator.GetFrame() && WebFrame::FromFrame(navigator.GetFrame())) {
-    WebFrame* main_frame = WebFrame::FromFrame(navigator.GetFrame())->Top();
-    if (main_frame) {
-      url::Origin main_frame_origin = main_frame->GetSecurityOrigin();
-      GetDocument()->UkmRecorder()->UpdateSourceURL(ukm_source_id_,
-                                                    main_frame_origin.GetURL());
-    }
-  }
 }
 
 int64_t NavigatorVR::GetSourceId() const {