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

chrome/browser/safe_browsing/safe_browsing_store_file.cc

Index: chrome/browser/safe_browsing/safe_browsing_store_file.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.cc b/chrome/browser/safe_browsing/safe_browsing_store_file.cc
index 01a5dc73395ced463b8b3be37e2c7e44a2d3c32c..68e10504e7da2d609e5fb93db433ab930b7c2280 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store_file.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_store_file.cc
@@ -49,7 +49,7 @@ const uint32 kMinShardStride = 1 << 24;
 const uint64 kMaxShardStride = 1ULL << 32;
 
 // Maximum SBPrefix value.
-const SBPrefix kMaxSBPrefix = ~0;
+const SBPrefix kMaxSBPrefix = 0xFFFFFFFF;
 
 // Header at the front of the main database file.
 struct FileHeaderV8 {
@@ -968,7 +968,7 @@ bool SafeBrowsingStoreFile::DoUpdate(
   // needs |in_stride|, while v7 needs to refer to header information.
   base::MD5Context in_context;
   int version = kInvalidVersion;
-  FileHeader header;
+  FileHeader header = {{0}};

[sky, 2014/07/15 04:22:24]

tricky

[Peter Kasting, 2014/07/15 18:56:07]

Yeah, I'm not a huge fan of this, but "= {0}" doesn't compile on all compilers,
and I didn't want to go so far as to add a constructor for the union -- that
feels pretty weird.

 
   if (!empty_) {
     DCHECK(file_.get());