Simplify VersionInfo code, avoid hitting sandbox IPC constantly on Windows

chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc

Index: chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc
index 77608340e4e04d501b0166845c7af2d7d6d7f796..0075ce010dd25eb78bd45aa76718167d747e5a47 100644
--- a/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/environment_data_collection.cc
@@ -41,17 +41,15 @@ ClientIncidentReport_EnvironmentData_Process_Channel MapChannelToProtobuf(
 // 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()));