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

net/base/net_log.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 "net/base/net_log.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 83 matching lines @@
   event_params->Set("source_dependency", dict);
 }
 
 NetLog::ParametersCallback NetLog::Source::ToEventParametersCallback() const {
   return base::Bind(&SourceEventParametersCallback, *this);
 }
 
 // static
 bool NetLog::Source::FromEventParameters(base::Value* event_params,
                                          Source* source) {
-  base::DictionaryValue* dict;
-  base::DictionaryValue* source_dict;
-  int source_id;
-  int source_type;
+  base::DictionaryValue* dict = NULL;
+  base::DictionaryValue* source_dict = NULL;
+  int source_id = -1;
+  int source_type = NetLog::SOURCE_COUNT;
   if (!event_params ||
       !event_params->GetAsDictionary(&dict) ||
       !dict->GetDictionary("source_dependency", &source_dict) ||
       !source_dict->GetInteger("id", &source_id) ||
       !source_dict->GetInteger("type", &source_type)) {
     *source = Source();
     return false;
   }
 
-  DCHECK_LE(0, source_id);
+  DCHECK_GE(source_id, 0);
   DCHECK_LT(source_type, NetLog::SOURCE_COUNT);
   *source = Source(static_cast<SourceType>(source_type), source_id);
   return true;
 }
 
 base::Value* NetLog::Entry::ToValue() const {
   base::DictionaryValue* entry_dict(new base::DictionaryValue());
 
   entry_dict->SetString("time", TickCountToString(data_->time));
 
@@ skipping 370 matching lines @@
 BoundNetLog BoundNetLog::Make(NetLog* net_log,
                               NetLog::SourceType source_type) {
   if (!net_log)
     return BoundNetLog();
 
   NetLog::Source source(source_type, net_log->NextID());
   return BoundNetLog(source, net_log);
 }
 
 }  // namespace net