MediaStream API: Update getUserMedia to match the spec

Source/modules/mediastream/NavigatorMediaStream.cpp

 /*
  *  Copyright (C) 2000 Harri Porten (porten@kde.org)
  *  Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org)
  *  Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org)
  *  Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc.
  *  Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 42 matching lines @@
         return;
 
     UserMediaController* userMedia = UserMediaController::from(navigator.frame() ? navigator.frame()->page() : 0);
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No user media controller available; is this a detached window?");
         return;
     }
 
     RefPtr<UserMediaRequest> request = UserMediaRequest::create(navigator.frame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
     if (!request) {
-        if (!exceptionState.hadException())
-            exceptionState.throwDOMException(NotSupportedError, "Failed to request user media.");
+        ASSERT(exceptionState.hadException());
         return;
     }
 
     request->start();
 }
 
 void NavigatorMediaStream::getMediaDevices(Navigator& navigator, PassOwnPtr<MediaDeviceInfoCallback> callback, ExceptionState& exceptionState)
 {
     UserMediaController* userMedia = UserMediaController::from(navigator.frame() ? navigator.frame()->page() : 0);
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No media device controller available; is this a detached window?");
         return;
     }
 
     RefPtr<MediaDevicesRequest> request = MediaDevicesRequest::create(navigator.frame()->document(), userMedia, callback, exceptionState);
     if (!request) {
         if (!exceptionState.hadException())
             exceptionState.throwDOMException(NotSupportedError, "Failed to request media devices.");
         return;
     }
 
     request->start();
 }
 
 } // namespace WebCore