commit 5c04a5193be87a85cdfc3fe9927d75c717d99698
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 15 12:29:53 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 15 12:29:53 2018 +0000
tree 34cc8854cbcf5cd0f03880dac3529c52b9067823
parent 55e73f3ac1258b5f6f2913b066ffe1bee42cabe9
parent 0ff07c7f4fdf27a7eacc53353c140e4ca8785f98

Merge "probe_producer: Post metadata to helper sources"

src/ipc/client_impl_unittest.cc

diff --git a/src/ipc/client_impl_unittest.cc b/src/ipc/client_impl_unittest.cc
index abe2494..5af3a78 100644
--- a/src/ipc/client_impl_unittest.cc
+++ b/src/ipc/client_impl_unittest.cc
@@ -350,7 +350,7 @@
 
   base::TempFile tx_file = base::TempFile::CreateUnlinked();
   static constexpr char kFileContent[] = "shared file";
-  write(tx_file.fd(), kFileContent, sizeof(kFileContent));
+  base::ignore_result(write(tx_file.fd(), kFileContent, sizeof(kFileContent)));
   host_->next_reply_fd = tx_file.fd();
 
   EXPECT_CALL(*host_method, OnInvoke(_, _))
@@ -394,7 +394,7 @@
 
   base::TempFile tx_file = base::TempFile::CreateUnlinked();
   static constexpr char kFileContent[] = "shared file";
-  write(tx_file.fd(), kFileContent, sizeof(kFileContent));
+  base::ignore_result(write(tx_file.fd(), kFileContent, sizeof(kFileContent)));
   EXPECT_CALL(*host_method, OnInvoke(_, _))
       .WillOnce(Invoke(
           [](const Frame::InvokeMethod& req, Frame::InvokeMethodReply* reply) {

src/ipc/host_impl_unittest.cc

diff --git a/src/ipc/host_impl_unittest.cc b/src/ipc/host_impl_unittest.cc
index cc46500..c2caccf 100644
--- a/src/ipc/host_impl_unittest.cc
+++ b/src/ipc/host_impl_unittest.cc
@@ -22,6 +22,7 @@
 #include "gtest/gtest.h"
 #include "perfetto/base/scoped_file.h"
 #include "perfetto/base/temp_file.h"
+#include "perfetto/base/utils.h"
 #include "perfetto/ipc/service.h"
 #include "perfetto/ipc/service_descriptor.h"
 #include "src/base/test/test_task_runner.h"
@@ -329,7 +330,7 @@
   cli_->InvokeMethod(cli_->last_bound_service_id_, 1, req_args);
   auto on_reply_sent = task_runner_->CreateCheckpoint("on_reply_sent");
   base::TempFile tx_file = base::TempFile::CreateUnlinked();
-  write(tx_file.fd(), kFileContent, sizeof(kFileContent));
+  base::ignore_result(write(tx_file.fd(), kFileContent, sizeof(kFileContent)));
   EXPECT_CALL(*fake_service, OnFakeMethod1(_, _))
       .WillOnce(Invoke([on_reply_sent, &tx_file](const RequestProto& req,
                                                  DeferredBase* reply) {
@@ -369,7 +370,7 @@
   static constexpr char kFileContent[] = "shared file";
   RequestProto req_args;
   base::TempFile tx_file = base::TempFile::CreateUnlinked();
-  write(tx_file.fd(), kFileContent, sizeof(kFileContent));
+  base::ignore_result(write(tx_file.fd(), kFileContent, sizeof(kFileContent)));
   cli_->InvokeMethod(cli_->last_bound_service_id_, 1, req_args, false,
                      tx_file.fd());
   EXPECT_CALL(*cli_, OnInvokeMethodReply(_));