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

Unified Diff: blimp/test/fake_engine/fake_engine_app_tests.cc

Issue 2473993003: Delete IPC::ChannelPosix, IPC::ChannelWin and IPC::AttachmentBroker. (Closed)
Patch Set: Created 4 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 | « blimp/test/fake_engine/BUILD.gn ('k') | chrome/utility/importer/firefox_importer_unittest_utils_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: blimp/test/fake_engine/fake_engine_app_tests.cc
diff --git a/blimp/test/fake_engine/fake_engine_app_tests.cc b/blimp/test/fake_engine/fake_engine_app_tests.cc
index 4c5121b693aa166dcdc1e1a75027c4916b9e9c00..21beb8738f8882b1fba0eaf9dcf4733907777437 100644
--- a/blimp/test/fake_engine/fake_engine_app_tests.cc
+++ b/blimp/test/fake_engine/fake_engine_app_tests.cc
@@ -5,6 +5,8 @@
#include "blimp/test/fake_engine/fake_engine.h"
#include <fcntl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
#include "base/command_line.h"
#include "base/files/file_path.h"
@@ -15,7 +17,6 @@
#include "blimp/test/fake_engine/proto/engine.grpc.pb.h"
#include "blimp/test/fake_engine/proto/lifetime.grpc.pb.h"
#include "blimp/test/fake_engine/proto/logging.grpc.pb.h"
-#include "ipc/ipc_channel.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/grpc/include/grpc++/create_channel_posix.h"
@@ -28,6 +29,30 @@ namespace blimp {
namespace {
+bool SocketPair(int* fd1, int* fd2) {
+ int pipe_fds[2];
+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, pipe_fds) != 0) {
+ PLOG(ERROR) << "socketpair()";
+ return false;
+ }
+
+ // Set both ends to be non-blocking.
+ if (fcntl(pipe_fds[0], F_SETFL, O_NONBLOCK) == -1 ||
+ fcntl(pipe_fds[1], F_SETFL, O_NONBLOCK) == -1) {
+ PLOG(ERROR) << "fcntl(O_NONBLOCK)";
+ if (IGNORE_EINTR(close(pipe_fds[0])) < 0)
+ PLOG(ERROR) << "close";
+ if (IGNORE_EINTR(close(pipe_fds[1])) < 0)
+ PLOG(ERROR) << "close";
+ return false;
+ }
+
+ *fd1 = pipe_fds[0];
+ *fd2 = pipe_fds[1];
+
+ return true;
+}
+
class MockLifetimeService : public Lifetime::Service {
public:
MOCK_METHOD3(EngineReady, grpc::Status(
@@ -52,8 +77,8 @@ class FakeEngineAppTest : public testing::Test {
protected:
void SetUp() override {
- CHECK(IPC::SocketPair(&rendering_server_connect_fd_, &engine_listen_fd_));
- CHECK(IPC::SocketPair(&rendering_server_listen_fd_, &engine_connect_fd_));
+ CHECK(SocketPair(&rendering_server_connect_fd_, &engine_listen_fd_));
+ CHECK(SocketPair(&rendering_server_listen_fd_, &engine_connect_fd_));
grpc::ServerBuilder builder;
builder.RegisterService(&mock_lifetime_service_);
« no previous file with comments | « blimp/test/fake_engine/BUILD.gn ('k') | chrome/utility/importer/firefox_importer_unittest_utils_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698