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

Unified Diff: mojo/edk/system/connection_manager_unittest.cc

Issue 1483823004: EDK: Move {platform_handle,scoped_platform_handle}.* to //mojo/edk/platform. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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 | « mojo/edk/system/connection_manager.h ('k') | mojo/edk/system/data_pipe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/connection_manager_unittest.cc
diff --git a/mojo/edk/system/connection_manager_unittest.cc b/mojo/edk/system/connection_manager_unittest.cc
index a42eac99492bfce862e33e6057b92732281b40cf..4bb10d8cd9db554be618fc95cec07297c164f3bb 100644
--- a/mojo/edk/system/connection_manager_unittest.cc
+++ b/mojo/edk/system/connection_manager_unittest.cc
@@ -18,6 +18,7 @@
#include "mojo/edk/embedder/simple_platform_support.h"
#include "mojo/edk/embedder/slave_process_delegate.h"
#include "mojo/edk/platform/message_loop.h"
+#include "mojo/edk/platform/platform_handle.h"
#include "mojo/edk/platform/test_message_loops.h"
#include "mojo/edk/system/master_connection_manager.h"
#include "mojo/edk/system/slave_connection_manager.h"
@@ -27,8 +28,9 @@
#include "mojo/public/cpp/system/macros.h"
#include "testing/gtest/include/gtest/gtest.h"
-using mojo::embedder::ScopedPlatformHandle;
using mojo::platform::MessageLoop;
+using mojo::platform::PlatformHandle;
+using mojo::platform::ScopedPlatformHandle;
using mojo::platform::TaskRunner;
using mojo::platform::test::CreateTestMessageLoop;
using mojo::util::MakeRefCounted;
@@ -39,8 +41,8 @@ namespace mojo {
namespace system {
namespace {
-bool ArePlatformHandlesConnected(const embedder::PlatformHandle& h1,
- const embedder::PlatformHandle& h2) {
+bool ArePlatformHandlesConnected(const PlatformHandle& h1,
+ const PlatformHandle& h2) {
const uint32_t w1 = 0xdeadbeef;
size_t num_bytes = 0;
if (!mojo::test::BlockingWrite(h1, &w1, sizeof(w1), &num_bytes) ||
« no previous file with comments | « mojo/edk/system/connection_manager.h ('k') | mojo/edk/system/data_pipe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698