Update getUserMedia counts to count Promise API and secure origin use

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 11 matching lines @@
 
 #include "config.h"
 #include "modules/mediastream/NavigatorMediaStream.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Navigator.h"
-#include "core/frame/OriginsUsingFeatures.h"
 #include "core/frame/Settings.h"
-#include "core/frame/UseCounter.h"
 #include "core/page/Page.h"
 #include "modules/mediastream/MediaDevicesRequest.h"
 #include "modules/mediastream/MediaStreamConstraints.h"
 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
 #include "modules/mediastream/UserMediaController.h"
 #include "modules/mediastream/UserMediaRequest.h"
-#include "platform/weborigin/SecurityOrigin.h"
 
 namespace blink {
 
 NavigatorMediaStream::NavigatorMediaStream()
 {
 }
 
 NavigatorMediaStream::~NavigatorMediaStream()
 {
 }
 
 void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const MediaStreamConstraints& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
 {
     if (!successCallback)
         return;
 
     UserMediaController* userMedia = UserMediaController::from(navigator.frame());
     if (!userMedia) {
         exceptionState.throwDOMException(NotSupportedError, "No user media controller available; is this a detached window?");
         return;
     }
 
     UserMediaRequest* request = UserMediaRequest::create(navigator.frame()->document(), userMedia, options, successCallback, errorCallback, exceptionState);
     if (!request) {
         ASSERT(exceptionState.hadException());
         return;
     }
 
     String errorMessage;
-    if (navigator.frame()->document()->isPrivilegedContext(errorMessage)) {
-        UseCounter::count(navigator.frame(), UseCounter::GetUserMediaSecureOrigin);
-    } else {
-        UseCounter::countDeprecation(navigator.frame(), UseCounter::GetUserMediaInsecureOrigin);
-        OriginsUsingFeatures::countAnyWorld(*navigator.frame()->document(), OriginsUsingFeatures::Feature::GetUserMediaInsecureOrigin);
+    if (!request->isPrivilegedContextUse(errorMessage)) {
         request->failPermissionDenied(errorMessage);
         return;
     }
 
     request->start();
 }
 
 } // namespace blink