| Index: chromeos/dbus/fake_upstart_client.cc
|
| diff --git a/chromeos/dbus/fake_upstart_client.cc b/chromeos/dbus/fake_upstart_client.cc
|
| index aec1044a9478d7af28f1aaa4763b684ac44f2536..620a2bee53cae8be5633f129a00af0ec657ea169 100644
|
| --- a/chromeos/dbus/fake_upstart_client.cc
|
| +++ b/chromeos/dbus/fake_upstart_client.cc
|
| @@ -10,7 +10,9 @@
|
|
|
| namespace chromeos {
|
|
|
| -FakeUpstartClient::FakeUpstartClient() {}
|
| +FakeUpstartClient::FakeUpstartClient()
|
| + : start_media_analytics_will_succeed_(true),
|
| + start_media_analytics_will_stall_(false) {}
|
|
|
| FakeUpstartClient::~FakeUpstartClient() {}
|
|
|
| @@ -30,14 +32,28 @@ void FakeUpstartClient::RestartAuthPolicyService() {
|
| authpolicy_client->set_started(true);
|
| }
|
|
|
| +void FakeUpstartClient::SetStartMediaAnalyticsWillSucceed(bool will_succeed) {
|
| + start_media_analytics_will_succeed_ = will_succeed;
|
| +}
|
| +
|
| +void FakeUpstartClient::SetStartMediaAnalyticsWillStall(bool will_stall) {
|
| + start_media_analytics_will_stall_ = will_stall;
|
| +}
|
| +
|
| void FakeUpstartClient::StartMediaAnalytics(const UpstartCallback& callback) {
|
| + if (!start_media_analytics_will_succeed_) {
|
| + callback.Run(false);
|
| + return;
|
| + }
|
| FakeMediaAnalyticsClient* media_analytics_client =
|
| static_cast<FakeMediaAnalyticsClient*>(
|
| DBusThreadManager::Get()->GetMediaAnalyticsClient());
|
| DLOG_IF(WARNING, media_analytics_client->process_running())
|
| << "Trying to start media analytics which is already started.";
|
| media_analytics_client->set_process_running(true);
|
| - callback.Run(true);
|
| + if (!start_media_analytics_will_stall_) {
|
| + callback.Run(true);
|
| + }
|
| }
|
|
|
| void FakeUpstartClient::StopMediaAnalytics() {
|
|
|