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

chrome/browser/enumerate_modules_model_win.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 "chrome/browser/enumerate_modules_model_win.h"
 
 #include <Tlhelp32.h>
 #include <wintrust.h>
 #include <algorithm>
 
@@ skipping 762 matching lines @@
       store,
       X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
       0,
       CERT_FIND_SUBJECT_CERT,
       &CertInfo,
       NULL);
   if (!cert_context)
     return base::string16();
 
   // Determine the size of the Subject name.
-  DWORD subject_name_size = 0;
-  if (!(subject_name_size = CertGetNameString(cert_context,
-                                              CERT_NAME_SIMPLE_DISPLAY_TYPE,
-                                              0,
-                                              NULL,
-                                              NULL,
-                                              0))) {
+  DWORD subject_name_size = CertGetNameString(
+      cert_context, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, NULL, 0);
+  if (!subject_name_size)
     return base::string16();
-  }
 
   base::string16 subject_name;
   subject_name.resize(subject_name_size);
 
   // Get subject name.
   if (!(CertGetNameString(cert_context,
                           CERT_NAME_SIMPLE_DISPLAY_TYPE,
                           0,
                           NULL,
                           const_cast<LPWSTR>(subject_name.c_str()),
@@ skipping 240 matching lines @@
   GenerateHash(base::WideToUTF8(module.location), &location);
   GenerateHash(base::WideToUTF8(module.description), &description);
   GenerateHash(base::WideToUTF8(module.digital_signer), &signer);
 
   base::string16 url =
       l10n_util::GetStringFUTF16(IDS_HELP_CENTER_VIEW_CONFLICTS,
           base::ASCIIToUTF16(filename), base::ASCIIToUTF16(location),
           base::ASCIIToUTF16(description), base::ASCIIToUTF16(signer));
   return GURL(base::UTF16ToUTF8(url));
 }