summaryrefslogtreecommitdiff
path: root/chromium/media/audio/audio_thread_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/audio/audio_thread_impl.cc')
-rw-r--r--chromium/media/audio/audio_thread_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/media/audio/audio_thread_impl.cc b/chromium/media/audio/audio_thread_impl.cc
index db3d4e84b7b..f52e7aae934 100644
--- a/chromium/media/audio/audio_thread_impl.cc
+++ b/chromium/media/audio/audio_thread_impl.cc
@@ -5,11 +5,11 @@
#include "media/audio/audio_thread_impl.h"
#include "base/message_loop/message_pump_type.h"
-#include "base/optional.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/default_tick_clock.h"
#include "build/build_config.h"
#include "media/audio/audio_thread_hang_monitor.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
namespace media {
@@ -23,7 +23,7 @@ AudioThreadImpl::AudioThreadImpl()
// FIDL-based APIs require async_t, which is initialized on IO thread.
thread_options.message_pump_type = base::MessagePumpType::IO;
#endif
- CHECK(thread_.StartWithOptions(thread_options));
+ CHECK(thread_.StartWithOptions(std::move(thread_options)));
#if defined(OS_MAC)
// On Mac, the audio task runner must belong to the main thread.
@@ -39,7 +39,7 @@ AudioThreadImpl::AudioThreadImpl()
// https://crbug.com/946968: The hang monitor possibly causes crashes on
// Android
hang_monitor_ = AudioThreadHangMonitor::Create(
- AudioThreadHangMonitor::HangAction::kDoNothing, base::nullopt,
+ AudioThreadHangMonitor::HangAction::kDoNothing, absl::nullopt,
base::DefaultTickClock::GetInstance(), task_runner_);
#endif
}