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

This contains fixes for the following sorts of issues:
* Signedness mismatch
* Assignment inside conditional
* Possibly-uninitialized local variable

BUG=81439
TEST=none

Review URL: https://codereview.chromium.org/371113002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281893 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index a4a99d4..119fbe5 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -1466,13 +1466,14 @@ 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;
 }