Move optional.h to webrtc/api/

webrtc/modules/video_coding/utility/quality_scaler.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
 
 #include <utility>
 
+#include "webrtc/api/optional.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/video_coding/utility/moving_average.h"
-#include "webrtc/rtc_base/optional.h"
 #include "webrtc/rtc_base/sequenced_task_checker.h"
 
 namespace webrtc {
 
 // An interface for signaling requests to limit or increase the resolution or
 // framerate of the captured video stream.
 class AdaptationObserverInterface {
  public:
   // Indicates if the adaptation is due to overuse of the CPU resources, or if
   // the quality of the encoded frames have dropped too low.
@@ skipping 48 matching lines @@
   const int64_t sampling_period_ms_;
   bool fast_rampup_ GUARDED_BY(&task_checker_);
   MovingAverage average_qp_ GUARDED_BY(&task_checker_);
   MovingAverage framedrop_percent_ GUARDED_BY(&task_checker_);
 
   VideoEncoder::QpThresholds thresholds_ GUARDED_BY(&task_checker_);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_