Commit 381793d7 authored by Sebastien Marchand's avatar Sebastien Marchand Committed by Commit Bot

Use a ScopedTaskEnvironment instead of a MessageLoop in MidiManagerTest

I'm making some changes to SystemMonitor in a separate CL that make it
require that a TaskScheduler instance exists, and as some of these tests
use SystemMonitor they need to be modified to use a
ScopedTaskEnvironment.

Change-Id: I900f8c999f8b16259299b6502145b11e348070ff
Reviewed-on: https://chromium-review.googlesource.com/c/1346909Reviewed-by: default avatarTakashi Toyoshima <toyoshim@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610386}
parent 2a4004c7
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/system/system_monitor.h" #include "base/system/system_monitor.h"
#include "base/test/scoped_task_environment.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "media/midi/midi_service.h" #include "media/midi/midi_service.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -144,7 +144,7 @@ class FakeMidiManagerClient : public MidiManagerClient { ...@@ -144,7 +144,7 @@ class FakeMidiManagerClient : public MidiManagerClient {
class MidiManagerTest : public ::testing::Test { class MidiManagerTest : public ::testing::Test {
public: public:
MidiManagerTest() : message_loop_(std::make_unique<base::MessageLoop>()) { MidiManagerTest() {
std::unique_ptr<FakeMidiManagerFactory> factory = std::unique_ptr<FakeMidiManagerFactory> factory =
std::make_unique<FakeMidiManagerFactory>(); std::make_unique<FakeMidiManagerFactory>();
factory_ = factory->GetWeakPtr(); factory_ = factory->GetWeakPtr();
...@@ -217,7 +217,7 @@ class MidiManagerTest : public ::testing::Test { ...@@ -217,7 +217,7 @@ class MidiManagerTest : public ::testing::Test {
base::WeakPtr<FakeMidiManagerFactory> factory() { return factory_; } base::WeakPtr<FakeMidiManagerFactory> factory() { return factory_; }
private: private:
std::unique_ptr<base::MessageLoop> message_loop_; base::test::ScopedTaskEnvironment env_;
base::WeakPtr<FakeMidiManagerFactory> factory_; base::WeakPtr<FakeMidiManagerFactory> factory_;
std::unique_ptr<MidiService> service_; std::unique_ptr<MidiService> service_;
......
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