commit 84f6a3fc6b7759e98889a38ab74980efbf418ce7
author kwiberg <kwiberg@webrtc.org> Tue Sep 05 08:43:13 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Sep 05 15:43:13 2017 +0000
tree a122fd2e609461b65169b993cb99aa7874a7c4bb
parent ad43d4b29e54a914eeb88e7bc26db2271c5742f5

Move optional.h to webrtc/api/

We use Optional in our public API, so its header should be in
webrtc/api/.

BUG=webrtc:8205

Review-Url: https://codereview.webrtc.org/3011943002
Cr-Commit-Position: refs/heads/master@{#19693}

webrtc/api/audio_codecs/opus/BUILD.gn

diff --git a/webrtc/api/audio_codecs/opus/BUILD.gn b/webrtc/api/audio_codecs/opus/BUILD.gn
index 658d151..faa5956 100644
--- a/webrtc/api/audio_codecs/opus/BUILD.gn
+++ b/webrtc/api/audio_codecs/opus/BUILD.gn
@@ -18,6 +18,7 @@
     "audio_encoder_opus_config.h",
   ]
   deps = [
+    "../..:optional",
     "../../../rtc_base:rtc_base_approved",
   ]
   defines = []
@@ -51,6 +52,7 @@
   ]
   deps = [
     "..:audio_codecs_api",
+    "../..:optional",
     "../../..:webrtc_common",
     "../../../modules/audio_coding:webrtc_opus",
     "../../../rtc_base:rtc_base_approved",

webrtc/api/audio_codecs/opus/audio_decoder_opus.h

diff --git a/webrtc/api/audio_codecs/opus/audio_decoder_opus.h b/webrtc/api/audio_codecs/opus/audio_decoder_opus.h
index 6a9d6da..272503d 100644
--- a/webrtc/api/audio_codecs/opus/audio_decoder_opus.h
+++ b/webrtc/api/audio_codecs/opus/audio_decoder_opus.h
@@ -16,7 +16,7 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/api/optional.h"
 
 namespace webrtc {
 

webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h

diff --git a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h b/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h
index c3fe17b..d07f784 100644
--- a/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h
+++ b/webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h
@@ -15,7 +15,7 @@
 
 #include <vector>
 
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/api/optional.h"
 
 namespace webrtc {