| Index: third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
|
| diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
|
| index 508787a50d2f02af04b7ffd303ecfdd2c7922a7f..6c192854ee78ea94f84a4fc6ef75898cf1d3027e 100644
|
| --- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
|
| +++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
|
| @@ -2,10 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/message_loop/message_loop.h"
|
| -#include "mojo/message_pump/message_pump_mojo.h"
|
| #include "mojo/public/cpp/bindings/binding.h"
|
| #include "mojo/public/cpp/bindings/strong_binding.h"
|
| +#include "mojo/public/cpp/environment/environment.h"
|
| +#include "mojo/public/cpp/utility/run_loop.h"
|
| #include "mojo/public/interfaces/bindings/tests/math_calculator.mojom.h"
|
| #include "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom.h"
|
| #include "mojo/public/interfaces/bindings/tests/sample_service.mojom.h"
|
| @@ -119,7 +119,7 @@
|
| // Add some more and wait for re-entrant call to Output!
|
| calculator_->Add(
|
| 1.0, MakeRunnable(&SelfDestructingMathCalculatorUI::Output, this));
|
| - base::MessageLoop::current()->RunUntilIdle();
|
| + RunLoop::current()->RunUntilIdle();
|
| } else {
|
| delete this;
|
| }
|
| @@ -184,13 +184,13 @@
|
|
|
| class InterfacePtrTest : public testing::Test {
|
| public:
|
| - InterfacePtrTest() : loop_(common::MessagePumpMojo::Create()) {}
|
| ~InterfacePtrTest() override { loop_.RunUntilIdle(); }
|
|
|
| void PumpMessages() { loop_.RunUntilIdle(); }
|
|
|
| private:
|
| - base::MessageLoop loop_;
|
| + Environment env_;
|
| + RunLoop loop_;
|
| };
|
|
|
| TEST_F(InterfacePtrTest, IsBound) {
|
| @@ -470,7 +470,8 @@
|
| };
|
|
|
| TEST(StrongConnectorTest, Math) {
|
| - base::MessageLoop loop(common::MessagePumpMojo::Create());
|
| + Environment env;
|
| + RunLoop loop;
|
|
|
| bool error_received = false;
|
| bool destroyed = false;
|
| @@ -538,7 +539,8 @@
|
| };
|
|
|
| TEST(WeakConnectorTest, Math) {
|
| - base::MessageLoop loop(common::MessagePumpMojo::Create());
|
| + Environment env;
|
| + RunLoop loop;
|
|
|
| bool error_received = false;
|
| bool destroyed = false;
|
|
|