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

components/wifi/wifi_service_win.cc

 // Copyright 2013 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 "components/wifi/wifi_service.h"
 
 #include <iphlpapi.h>
 #include <objbase.h>
 #include <wlanapi.h>
 
@@ skipping 1448 matching lines @@
   if (bss_list != NULL)
     WlanFreeMemory_function_(bss_list);
 
   return error;
 }
 
 Frequency WiFiServiceImpl::GetFrequencyToConnect(
     const std::string& network_guid) const {
   // Check whether desired frequency is set in |connect_properties_|.
   const base::DictionaryValue* properties;
-  const base::DictionaryValue* wifi;
-  int frequency;
-  if (connect_properties_.GetDictionaryWithoutPathExpansion(
-          network_guid, &properties) &&
-      properties->GetDictionary(onc::network_type::kWiFi, &wifi) &&
-      wifi->GetInteger(onc::wifi::kFrequency, &frequency)) {
-    return GetNormalizedFrequency(frequency);
+  if (connect_properties_.GetDictionaryWithoutPathExpansion(network_guid,
+                                                            &properties)) {
+    const base::DictionaryValue* wifi;
+    if (properties->GetDictionary(onc::network_type::kWiFi, &wifi)) {
+      int frequency;
+      if (wifi->GetInteger(onc::wifi::kFrequency, &frequency))
+        return GetNormalizedFrequency(frequency);
+    }
   }
   return kFrequencyAny;
 }
 
 DWORD WiFiServiceImpl::GetDesiredBssList(
     DOT11_SSID& ssid,
     Frequency frequency,
     scoped_ptr<DOT11_BSSID_LIST>* desired_list) {
   if (client_ == NULL) {
     NOTREACHED();
@@ skipping 354 matching lines @@
     NetworkGuidList changed_networks(1, network_guid);
     message_loop_proxy_->PostTask(
         FROM_HERE,
         base::Bind(networks_changed_observer_, changed_networks));
   }
 }
 
 WiFiService* WiFiService::Create() { return new WiFiServiceImpl(); }
 
 }  // namespace wifi