Fixes for re-enabling more MSVC level 4 warnings: misc edition #2

sync/internal_api/public/base/invalidation.cc

 // Copyright 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 "sync/internal_api/public/base/invalidation.h"
 
 #include <cstddef>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/rand_util.h"
@@ skipping 55 matching lines @@
     DLOG(WARNING) << "Failed to parse is_unknown_version flag";
     return scoped_ptr<Invalidation>();
   }
   if (is_unknown_version) {
     return scoped_ptr<Invalidation>(new Invalidation(
         id,
         true,
         kInvalidVersion,
         std::string(),
         AckHandle::CreateUnique()));
-  } else {
-    int64 version;
-    std::string version_as_string;
-    if (!value.GetString(kVersionKey, &version_as_string)
-        || !base::StringToInt64(version_as_string, &version)) {
-      DLOG(WARNING) << "Failed to parse version";
-      return scoped_ptr<Invalidation>();
-    }
-    std::string payload;
-    if (!value.GetString(kPayloadKey, &payload)) {
-      DLOG(WARNING) << "Failed to parse payload";
-      return scoped_ptr<Invalidation>();
-    }
-    return scoped_ptr<Invalidation>(new Invalidation(
-        id,
-        false,
-        version,
-        payload,
-        AckHandle::CreateUnique()));
   }
+  int64 version = 0;
+  std::string version_as_string;
+  if (!value.GetString(kVersionKey, &version_as_string)
+      || !base::StringToInt64(version_as_string, &version)) {
+    DLOG(WARNING) << "Failed to parse version";
+    return scoped_ptr<Invalidation>();
+  }
+  std::string payload;
+  if (!value.GetString(kPayloadKey, &payload)) {
+    DLOG(WARNING) << "Failed to parse payload";
+    return scoped_ptr<Invalidation>();
+  }
+  return scoped_ptr<Invalidation>(new Invalidation(
+      id,
+      false,
+      version,
+      payload,
+      AckHandle::CreateUnique()));
 }
 
 Invalidation::~Invalidation() {}
 
 Invalidation& Invalidation::operator=(const Invalidation& other) {
   id_ = other.id_;
   is_unknown_version_ = other.is_unknown_version_;
   version_ = other.version_;
   payload_ = other.payload_;
   ack_handle_ = other.ack_handle_;
@@ skipping 83 matching lines @@
     int64 version,
     const std::string& payload,
     AckHandle ack_handle)
   : id_(id),
     is_unknown_version_(is_unknown_version),
     version_(version),
     payload_(payload),
     ack_handle_(ack_handle) {}
 
 }  // namespace syncer