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

Unified Diff: ipc/ipc_message_unittest.cc

Issue 1392713004: ipc: Add missing includes for USE_ATTACHMENT_BROKER. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit test. Created 5 years, 2 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 | « ipc/ipc_message.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message_unittest.cc
diff --git a/ipc/ipc_message_unittest.cc b/ipc/ipc_message_unittest.cc
index a4f9af07244c6491fdc303f565aafc67e081f0bc..bb133e5792fbfc70487daefe521332d81db980dd 100644
--- a/ipc/ipc_message_unittest.cc
+++ b/ipc/ipc_message_unittest.cc
@@ -11,6 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
+#include "ipc/attachment_broker.h"
#include "ipc/ipc_message_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -148,7 +149,7 @@ TEST(IPCMessageTest, FindNext) {
// (but contains the message header)
IPC::Message::FindNext(data_start, data_end - 1, &next);
EXPECT_FALSE(next.message_found);
-#if USE_ATTACHMENT_BROKER
+#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS)
EXPECT_EQ(next.message_size, 0u);
#else
EXPECT_EQ(next.message_size, message.size());
@@ -184,7 +185,7 @@ TEST(IPCMessageTest, FindNextOverflow) {
message.header()->payload_size = static_cast<uint32_t>(-1);
IPC::Message::FindNext(data_start, data_end, &next);
EXPECT_FALSE(next.message_found);
-#if USE_ATTACHMENT_BROKER
+#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS)
EXPECT_EQ(next.message_size, 0u);
#else
if (sizeof(size_t) > sizeof(uint32_t)) {
@@ -202,7 +203,7 @@ TEST(IPCMessageTest, FindNextOverflow) {
message.header()->payload_size = std::numeric_limits<int32_t>::max();
IPC::Message::FindNext(data_start, data_end, &next);
EXPECT_FALSE(next.message_found);
-#if USE_ATTACHMENT_BROKER
+#if USE_ATTACHMENT_BROKER && defined(OS_MACOSX) && !defined(OS_IOS)
EXPECT_EQ(next.message_size, 0u);
#else
EXPECT_EQ(next.message_size,
« no previous file with comments | « ipc/ipc_message.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698