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

base/debug/trace_event_win.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_win.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include <initguid.h>  // NOLINT
 
 namespace base {
@@ skipping 88 matching lines @@
 
 void TraceEventETWProvider::Trace(const char* name,
                                   size_t name_len,
                                   char type,
                                   const void* id,
                                   const char* extra,
                                   size_t extra_len) {
   TraceEventETWProvider* provider = TraceEventETWProvider::GetInstance();
   if (provider && provider->IsTracing()) {
     // Compute the name & extra lengths if not supplied already.
-    if (name_len == -1)
+    if (name_len == kUseStrlen)
       name_len = (name == NULL) ? 0 : strlen(name);
-    if (extra_len == -1)
+    if (extra_len == kUseStrlen)
       extra_len = (extra == NULL) ? 0 : strlen(extra);
 
     provider->TraceEvent(name, name_len, type, id, extra, extra_len);
   }
 }
 
 void TraceEventETWProvider::Resurrect() {
   StaticMemorySingletonTraits<TraceEventETWProvider>::Resurrect();
 }
 
 }  // namespace debug
 }  // namespace base