Fixes for re-enabling more MSVC level 4 warnings: base/ edition

base/debug/trace_event_unittest.cc

Index: base/debug/trace_event_unittest.cc
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
index c843c25f54039f376b014a6f9a3b843190e85e6e..0e5123d9e2db1a901ae8e92beec2ed07ac86900b 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/debug/trace_event_unittest.cc
@@ -489,11 +489,14 @@ void ValidateAllTraceMacrosCreatedData(const ListValue& trace_parsed) {
   const DictionaryValue* item = NULL;
 
 #define EXPECT_FIND_(string) \
-    EXPECT_TRUE((item = FindTraceEntry(trace_parsed, string)));
+    item = FindTraceEntry(trace_parsed, string); \
+    EXPECT_TRUE(item);
 #define EXPECT_NOT_FIND_(string) \
-    EXPECT_FALSE((item = FindTraceEntry(trace_parsed, string)));
+    item = FindTraceEntry(trace_parsed, string); \
+    EXPECT_FALSE(item);
 #define EXPECT_SUB_FIND_(string) \
-    if (item) EXPECT_TRUE((IsStringInDict(string, item)));
+    if (item) \
+      EXPECT_TRUE(IsStringInDict(string, item));
 
   EXPECT_FIND_("ETW Trace Event");
   EXPECT_FIND_("all");
@@ -513,8 +516,8 @@ void ValidateAllTraceMacrosCreatedData(const ListValue& trace_parsed) {
     EXPECT_TRUE((item = FindTraceEntry(trace_parsed, "TRACE_EVENT0 call")));
     EXPECT_TRUE((item && item->GetString("ph", &ph)));
     EXPECT_EQ("X", ph);
-    EXPECT_FALSE((item = FindTraceEntry(trace_parsed, "TRACE_EVENT0 call",
-                                       item)));
+    item = FindTraceEntry(trace_parsed, "TRACE_EVENT0 call", item);
+    EXPECT_FALSE(item);
   }
   EXPECT_FIND_("TRACE_EVENT1 call");
   EXPECT_SUB_FIND_("name1");