Refactor "track options" to be a dictionary.

third_party/WebKit/Source/modules/mediastream/UserMediaRequest.cpp

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 25 matching lines @@
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/SpaceSplitString.h"
 #include "core/frame/UseCounter.h"
 #include "modules/mediastream/MediaConstraintsImpl.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/mediastream/MediaStreamConstraints.h"
+#include "modules/mediastream/MediaTrackConstraintSet.h"
 #include "modules/mediastream/UserMediaController.h"
 #include "platform/mediastream/MediaStreamCenter.h"
 #include "platform/mediastream/MediaStreamDescriptor.h"
 
 namespace blink {
 
-static WebMediaConstraints parseOptions(const BooleanOrDictionary& options, ExceptionState& exceptionState)
+static WebMediaConstraints parseOptions(const BooleanOrMediaTrackConstraintSet& options, ExceptionState& exceptionState)
 {
     WebMediaConstraints constraints;
 
     Dictionary constraintsDictionary;
-    if (options.isDictionary()) {
-        constraints = MediaConstraintsImpl::create(options.getAsDictionary(), exceptionState);
+    if (options.isNull()) {
+        // Do nothing.

[Guido Urdaneta, 2015/10/05 12:34:12]

Is this possible?
Should there be a NOTREACHED here?

[hta - Chromium, 2015/10/05 12:54:01]

It is possible. When you call getUserMedia({video: true}), options will be null
for audio (not false). The tests actually caught this one.

I find the if/then(nothing)/elsif(something)/else structure awkward, but didn't
find a simpler way to write it.

+    } else if (options.isMediaTrackConstraintSet()) {
+        constraints = MediaConstraintsImpl::create(options.getAsMediaTrackConstraintSet(), exceptionState);
     } else {
+        ASSERT(options.isBoolean());
         if (options.getAsBoolean()) {
             constraints = MediaConstraintsImpl::create();
         }
     }
 
     return constraints;
 }
 
 UserMediaRequest* UserMediaRequest::create(ExecutionContext* context, UserMediaController* controller, const MediaStreamConstraints& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
 {
@@ skipping 134 matching lines @@
 
 DEFINE_TRACE(UserMediaRequest)
 {
     visitor->trace(m_controller);
     visitor->trace(m_successCallback);
     visitor->trace(m_errorCallback);
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink