Move Location to DOMWindow

Source/modules/mediastream/NavigatorMediaStream.cpp

Index: Source/modules/mediastream/NavigatorMediaStream.cpp
diff --git a/Source/modules/mediastream/NavigatorMediaStream.cpp b/Source/modules/mediastream/NavigatorMediaStream.cpp
index a453721e1a0be4b2a84a37d1a2e09e432ab93de8..d4c5e3e01daea4abf7f0360f75255178328ba8e4 100644
--- a/Source/modules/mediastream/NavigatorMediaStream.cpp
+++ b/Source/modules/mediastream/NavigatorMediaStream.cpp
@@ -55,24 +55,24 @@ void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictio
     if (!successCallback)
         return;
 
-    UserMediaController* userMedia = UserMediaController::from(navigator.frame());
+    UserMediaController* userMedia = UserMediaController::from(navigator.localFrame());
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No user media controller available; is this a detached window?");
         return;
     }
 
     String errorMessage;
-    if (navigator.frame()->document()->securityOrigin()->canAccessFeatureRequiringSecureOrigin(errorMessage)) {
-        UseCounter::count(navigator.frame(), UseCounter::GetUserMediaSecureOrigin);
+    if (navigator.localFrame()->document()->securityOrigin()->canAccessFeatureRequiringSecureOrigin(errorMessage)) {
+        UseCounter::count(navigator.localFrame(), UseCounter::GetUserMediaSecureOrigin);
     } else {
-        UseCounter::count(navigator.frame(), UseCounter::GetUserMediaInsecureOrigin);
+        UseCounter::count(navigator.localFrame(), UseCounter::GetUserMediaInsecureOrigin);
         if (navigator.frame()->settings()->strictPowerfulFeatureRestrictions()) {
             exceptionState.throwSecurityError(ExceptionMessages::failedToExecute("webkitGetUserMedia", "Navigator", errorMessage));
             return;
         }
     }
 
-    UserMediaRequest* request = UserMediaRequest::create(navigator.frame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
+    UserMediaRequest* request = UserMediaRequest::create(navigator.localFrame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
     if (!request) {
         ASSERT(exceptionState.hadException());
         return;
@@ -83,13 +83,13 @@ void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictio
 
 void NavigatorMediaStream::getMediaDevices(Navigator& navigator, MediaDeviceInfoCallback* callback, ExceptionState& exceptionState)
 {
-    UserMediaController* userMedia = UserMediaController::from(navigator.frame());
+    UserMediaController* userMedia = UserMediaController::from(navigator.localFrame());
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No media device controller available; is this a detached window?");
         return;
     }
 
-    MediaDevicesRequest* request = MediaDevicesRequest::create(navigator.frame()->document(), userMedia, callback, exceptionState);
+    MediaDevicesRequest* request = MediaDevicesRequest::create(navigator.localFrame()->document(), userMedia, callback, exceptionState);
     if (!request) {
         if (!exceptionState.hadException())
             exceptionState.throwDOMException(NotSupportedError, "Failed to request media devices.");