Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(638)

Unified Diff: components/arc/arc_bridge_service_unittest.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/arc/arc_bridge_bootstrap.cc ('k') | components/arc/input/arc_input_bridge_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/arc_bridge_service_unittest.cc
diff --git a/components/arc/arc_bridge_service_unittest.cc b/components/arc/arc_bridge_service_unittest.cc
index 74100b7523c56eeb26006c617f007ccc3be8794d..cd39963466c21bdf4a446e7584f63e3dd239ba61 100644
--- a/components/arc/arc_bridge_service_unittest.cc
+++ b/components/arc/arc_bridge_service_unittest.cc
@@ -11,7 +11,6 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "components/arc/arc_bridge_service_impl.h"
#include "components/arc/test/fake_arc_bridge_instance.h"
-#include "ipc/mojo/scoped_ipc_support.h"
#include "mojo/public/cpp/environment/environment.h"
#include "mojo/public/cpp/system/message_pipe.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -84,7 +83,6 @@ class ArcBridgeTest : public testing::Test, public ArcBridgeService::Observer {
ready_ = false;
state_ = ArcBridgeService::State::STOPPED;
- ipc_support_.reset(new IPC::ScopedIPCSupport(message_loop_.task_runner()));
instance_.reset(new FakeArcBridgeInstance());
service_.reset(new ArcBridgeServiceImpl(
make_scoped_ptr(new FakeArcBridgeBootstrap(instance_.get()))));
@@ -96,14 +94,12 @@ class ArcBridgeTest : public testing::Test, public ArcBridgeService::Observer {
service_->RemoveObserver(this);
instance_.reset();
service_.reset();
- ipc_support_.reset();
chromeos::DBusThreadManager::Shutdown();
}
bool ready_;
ArcBridgeService::State state_;
- scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
base::MessageLoopForUI message_loop_;
DISALLOW_COPY_AND_ASSIGN(ArcBridgeTest);
« no previous file with comments | « components/arc/arc_bridge_bootstrap.cc ('k') | components/arc/input/arc_input_bridge_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698