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

base/metrics/stats_table.cc

 // Copyright (c) 2011 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/metrics/stats_table.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/process/process_handle.h"
@@ skipping 460 matching lines @@
 
 int* StatsTable::FindLocation(const char* name) {
   // Get the static StatsTable
   StatsTable *table = StatsTable::current();
   if (!table)
     return NULL;
 
   // Get the slot for this thread.  Try to register
   // it if none exists.
   int slot = table->GetSlot();
-  if (!slot && !(slot = table->RegisterThread(std::string())))
+  if (!slot)
+    slot = table->RegisterThread(std::string());
+  if (!slot)
     return NULL;
 
   // Find the counter id for the counter.
   std::string str_name(name);
   int counter = table->FindCounter(str_name);
 
   // Now we can find the location in the table.
   return table->GetLocation(counter, slot);
 }
 
@@ skipping 114 matching lines @@
 
 #if defined(OS_POSIX)
 SharedMemoryHandle StatsTable::GetSharedMemoryHandle() const {
   if (!internal_)
     return SharedMemory::NULLHandle();
   return internal_->shared_memory()->handle();
 }
 #endif
 
 }  // namespace base