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

components/domain_reliability/scheduler.cc

@@ -13,7 +13,7 @@
 
 namespace {
 
-const unsigned kInvalidCollectorIndex = -1;
+const unsigned kInvalidCollectorIndex = static_cast<unsigned>(-1);
 
 const unsigned kDefaultMinimumUploadDelaySec = 60;
 const unsigned kDefaultMaximumUploadDelaySec = 300;

components/password_manager/core/browser/password_form_manager.cc

@@ -629,8 +629,9 @@ void PasswordFormManager::CheckForAccountCreationForm(
     if (!pending.form_data.fields.empty() &&
         pending_structure.FormSignature() !=
             observed_structure.FormSignature()) {
-      autofill::AutofillManager* autofill_manager;
-      if ((autofill_manager = driver_->GetAutofillManager())) {
+      autofill::AutofillManager* autofill_manager =
+          driver_->GetAutofillManager();
+      if (autofill_manager) {
         // Note that this doesn't guarantee that the upload succeeded, only that
         // |pending.form_data| is considered uploadable.
         bool success =

components/search_engines/template_url.cc

@@ -227,7 +227,7 @@ TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
 TemplateURLRef::TemplateURLRef(TemplateURL* owner, Type type)
     : owner_(owner),
       type_(type),
-      index_in_owner_(-1),
+      index_in_owner_(0),
       parsed_(false),
       valid_(false),
       supports_replacements_(false),

components/search_engines/template_url_prepopulate_data.cc

@@ -1100,7 +1100,7 @@ ScopedVector<TemplateURLData> GetPrepopulatedTemplateURLData(
     std::string search_url;
     std::string favicon_url;
     std::string encoding;
-    int id;
+    int id = -1;
     // The following fields are required for each search engine configuration.
     if (list->GetDictionary(i, &engine) &&
         engine->GetString("name", &name) && !name.empty() &&

components/translate/core/browser/translate_infobar_delegate.cc

@@ -42,7 +42,7 @@ const int kNeverTranslateMinCount = 3;
 
 }  // namespace
 
-const size_t TranslateInfoBarDelegate::kNoIndex = TranslateUIDelegate::NO_INDEX;
+const size_t TranslateInfoBarDelegate::kNoIndex = TranslateUIDelegate::kNoIndex;
 
 TranslateInfoBarDelegate::~TranslateInfoBarDelegate() {
 }

components/translate/core/browser/translate_ui_delegate.cc

@@ -38,9 +38,9 @@ TranslateUIDelegate::TranslateUIDelegate(
     : translate_driver_(
           translate_manager->translate_client()->GetTranslateDriver()),
       translate_manager_(translate_manager),
-      original_language_index_(NO_INDEX),
-      initial_original_language_index_(NO_INDEX),
-      target_language_index_(NO_INDEX) {
+      original_language_index_(kNoIndex),
+      initial_original_language_index_(kNoIndex),
+      target_language_index_(kNoIndex) {
   DCHECK(translate_driver_);
   DCHECK(translate_manager_);
 
@@ -140,16 +140,16 @@ std::string TranslateUIDelegate::GetLanguageCodeAt(size_t index) const {
 }
 
 base::string16 TranslateUIDelegate::GetLanguageNameAt(size_t index) const {
-  if (index == static_cast<size_t>(NO_INDEX))
+  if (index == kNoIndex)
     return base::string16();
   DCHECK_LT(index, GetNumberOfLanguages());
   return languages_[index].second;
 }
 
 std::string TranslateUIDelegate::GetOriginalLanguageCode() const {
-  return (GetOriginalLanguageIndex() == static_cast<size_t>(NO_INDEX))
-             ? translate::kUnknownLanguageCode
-             : GetLanguageCodeAt(GetOriginalLanguageIndex());
+  return (GetOriginalLanguageIndex() == kNoIndex) ?
+      translate::kUnknownLanguageCode :
+      GetLanguageCodeAt(GetOriginalLanguageIndex());
 }
 
 std::string TranslateUIDelegate::GetTargetLanguageCode() const {

components/translate/core/browser/translate_ui_delegate.h

@@ -24,7 +24,7 @@ class TranslatePrefs;
 // feature to the user.
 class TranslateUIDelegate {
  public:
-  enum { NO_INDEX = -1, };
+  static const size_t kNoIndex = static_cast<size_t>(-1);
 
   TranslateUIDelegate(const base::WeakPtr<TranslateManager>& translate_manager,
                       const std::string& original_language,

components/url_matcher/substring_set_matcher.cc

@@ -229,7 +229,7 @@ void SubstringSetMatcher::CreateFailureEdges() {
   }
 }
 
-const uint32 SubstringSetMatcher::AhoCorasickNode::kNoSuchEdge = ~0;
+const uint32 SubstringSetMatcher::AhoCorasickNode::kNoSuchEdge = 0xFFFFFFFF;
 
 SubstringSetMatcher::AhoCorasickNode::AhoCorasickNode()
     : failure_(kNoSuchEdge) {}

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;
 }