Move optional.h to webrtc/api/

webrtc/api/mediaconstraintsinterface.h

 /*
  *  Copyright 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 // This file contains the interface for MediaConstraints, corresponding to
 // the definition at
 // http://www.w3.org/TR/mediacapture-streams/#mediastreamconstraints and also
 // used in WebRTC: http://dev.w3.org/2011/webrtc/editor/webrtc.html#constraints.
 
 // This interface is being deprecated in Chrome, and may be removed
 // from WebRTC too.
 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5617
 
 #ifndef WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_
 #define WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_
 
 #include <string>
 #include <vector>
 
+#include "webrtc/api/optional.h"
 #include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 
 // Interface used for passing arguments about media constraints
 // to the MediaStream and PeerConnection implementation.
 //
 // Constraints may be either "mandatory", which means that unless satisfied,
 // the method taking the constraints should fail, or "optional", which means
 // they may not be satisfied..
 class MediaConstraintsInterface {
@@ skipping 107 matching lines @@
     PeerConnectionInterface::RTCConfiguration* configuration);
 
 // Copy all relevant constraints into an AudioOptions object.
 void CopyConstraintsIntoAudioOptions(
     const MediaConstraintsInterface* constraints,
     cricket::AudioOptions* options);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_MEDIACONSTRAINTSINTERFACE_H_