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

base/debug/trace_event_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/debug/trace_event_unittest.h"
 
 #include <math.h>
 #include <cstdlib>
 
 #include "base/bind.h"
@@ skipping 471 matching lines @@
   } // Scope close causes TRACE_EVENT0 etc to send their END events.
 
   if (task_complete_event)
     task_complete_event->Signal();
 }
 
 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");
   EXPECT_FIND_("TRACE_EVENT_BEGIN_ETW call");
   {
     std::string str_val;
     EXPECT_TRUE(item && item->GetString("args.id", &str_val));
     EXPECT_STREQ("0x1122", str_val.c_str());
   }
   EXPECT_SUB_FIND_("extrastring1");
   EXPECT_FIND_("TRACE_EVENT_END_ETW call");
   EXPECT_FIND_("TRACE_EVENT_INSTANT_ETW call");
   EXPECT_FIND_("TRACE_EVENT0 call");
   {
     std::string ph;
     std::string ph_end;
     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");
   EXPECT_SUB_FIND_("value1");
   EXPECT_FIND_("TRACE_EVENT2 call");
   EXPECT_SUB_FIND_("name1");
   EXPECT_SUB_FIND_("\"value1\"");
   EXPECT_SUB_FIND_("name2");
   EXPECT_SUB_FIND_("value\\2");
 
@@ skipping 2342 matching lines @@
 }
 
 TEST_F(TraceEventTestFixture, SyntheticDelayConfigurationToString) {
   const char config[] = "DELAY(test.Delay;16;oneshot)";
   CategoryFilter filter(config);
   EXPECT_EQ(config, filter.ToString());
 }
 
 }  // namespace debug
 }  // namespace base