Commit 59ea0fee authored by Max Morin's avatar Max Morin Committed by Commit Bot

Change device_id member to be by value in InputIPC.

Bug: 854589
Change-Id: Ic3df198b77eb5dca4ebd85c637d47c162a5e58bd
Reviewed-on: https://chromium-review.googlesource.com/1107807Reviewed-by: default avatarOlga Sharonova <olka@chromium.org>
Commit-Queue: Max Morin <maxmorin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568884}
parent 2cf2ad2f
...@@ -17,7 +17,7 @@ InputIPC::InputIPC(std::unique_ptr<service_manager::Connector> connector, ...@@ -17,7 +17,7 @@ InputIPC::InputIPC(std::unique_ptr<service_manager::Connector> connector,
media::mojom::AudioLogPtr log) media::mojom::AudioLogPtr log)
: stream_(), : stream_(),
stream_client_binding_(this), stream_client_binding_(this),
device_id_(std::move(device_id)), device_id_(device_id),
stream_factory_(), stream_factory_(),
stream_factory_info_(), stream_factory_info_(),
log_(std::move(log)), log_(std::move(log)),
......
...@@ -57,7 +57,7 @@ class InputIPC : public media::AudioInputIPC, ...@@ -57,7 +57,7 @@ class InputIPC : public media::AudioInputIPC,
mojo::Binding<AudioInputStreamClient> stream_client_binding_; mojo::Binding<AudioInputStreamClient> stream_client_binding_;
media::AudioInputIPCDelegate* delegate_ = nullptr; media::AudioInputIPCDelegate* delegate_ = nullptr;
const std::string& device_id_; std::string device_id_;
base::Optional<base::UnguessableToken> stream_id_; base::Optional<base::UnguessableToken> stream_id_;
// stream_factory_info_ is bound in the constructor, and later used to // stream_factory_info_ is bound in the constructor, and later used to
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include "services/audio/public/cpp/input_ipc.h" #include "services/audio/public/cpp/input_ipc.h"
#include <string>
#include <utility>
#include "base/test/scoped_task_environment.h" #include "base/test/scoped_task_environment.h"
#include "media/mojo/interfaces/audio_data_pipe.mojom.h" #include "media/mojo/interfaces/audio_data_pipe.mojom.h"
#include "mojo/public/cpp/system/buffer.h" #include "mojo/public/cpp/system/buffer.h"
...@@ -20,7 +23,7 @@ namespace audio { ...@@ -20,7 +23,7 @@ namespace audio {
namespace { namespace {
const std::string& kDeviceId = "1234"; const char kDeviceId[] = "1234";
const size_t kShMemSize = 456; const size_t kShMemSize = 456;
const double kNewVolume = 0.271828; const double kNewVolume = 0.271828;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment