Simplify VersionInfo code, avoid hitting sandbox IPC constantly on Windows

chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc

 // Copyright 2014 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/safe_browsing/incident_reporting/environment_data_collection.h"
 
 #include <string>
 
 #include "base/cpu.h"
 #include "base/sys_info.h"
@@ skipping 23 matching lines @@
     case VersionInfo::CHANNEL_STABLE:
       return Process::CHANNEL_STABLE;
     default:
       return Process::CHANNEL_UNKNOWN;
   }
 }
 
 // Populates |process| with data related to the chrome browser process.
 void CollectProcessData(ClientIncidentReport_EnvironmentData_Process* process) {
   chrome::VersionInfo version_info;
-  if (version_info.is_valid()) {
-    // TODO(grt): Move this logic into VersionInfo (it also appears in
-    // ChromeMetricsServiceClient).
-    std::string version(version_info.Version());
+  // TODO(grt): Move this logic into VersionInfo (it also appears in
+  // ChromeMetricsServiceClient).
+  std::string version(version_info.Version());
 #if defined(ARCH_CPU_64_BITS)
-    version += "-64";
+  version += "-64";
 #endif  // defined(ARCH_CPU_64_BITS)
-    if (!version_info.IsOfficialBuild())
-      version += "-devel";
-    process->set_version(version);
-  }
+  if (!version_info.IsOfficialBuild())
+    version += "-devel";
+  process->set_version(version);
 
   process->set_chrome_update_channel(
       MapChannelToProtobuf(chrome::VersionInfo::GetChannel()));
 
   CollectPlatformProcessData(process);
 }
 
 }  // namespace
 
 void CollectEnvironmentData(ClientIncidentReport_EnvironmentData* data) {
@@ skipping 20 matching lines @@
 
 #if !defined(OS_WIN)
 void CollectPlatformProcessData(
     ClientIncidentReport_EnvironmentData_Process* process) {
   // Empty implementation for platforms that do not (yet) have their own
   // implementations.
 }
 #endif
 
 }  // namespace safe_browsing