Move optional.h to webrtc/api/

webrtc/modules/audio_coding/acm2/codec_manager.h

 /*
  *  Copyright (c) 2015 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_AUDIO_CODING_ACM2_CODEC_MANAGER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_
 
 #include <map>
 
+#include "webrtc/api/optional.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/optional.h"
 #include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 
 class AudioDecoder;
 class AudioEncoder;
 
 namespace acm2 {
 
 class CodecManager final {
@@ skipping 34 matching lines @@
   rtc::Optional<CodecInst> send_codec_inst_;
   RentACodec::StackParameters codec_stack_params_;
   bool recreate_encoder_ = true;  // Need to recreate encoder?
 
   RTC_DISALLOW_COPY_AND_ASSIGN(CodecManager);
 };
 
 }  // namespace acm2
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_ACM2_CODEC_MANAGER_H_