Simplify VersionInfo code, avoid hitting sandbox IPC constantly on Windows

chrome/browser/diagnostics/recon_diagnostics.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/diagnostics/recon_diagnostics.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ skipping 341 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PathTest);
 };
 
 // Check the version of Chrome.
 class VersionTest : public DiagnosticsTest {
  public:
   VersionTest() : DiagnosticsTest(DIAGNOSTICS_VERSION_TEST) {}
 
   virtual bool ExecuteImpl(DiagnosticsModel::Observer* observer) OVERRIDE {
     chrome::VersionInfo version_info;
-    if (!version_info.is_valid()) {
-      RecordFailure(DIAG_RECON_NO_VERSION, "No Version");

[Lei Zhang, 2014/10/06 19:22:52]

DIAG_RECON_NO_VERSION is no longer used, but I'm not sure if we can get rid of
the enum. You'll have to ask cpu.

[cpu_(ooo_6.6-7.5), 2014/10/06 19:27:43]

This might be used by CroS. Sad times.

-      return true;
-    }
     std::string current_version = version_info.Version();
     if (current_version.empty()) {
       RecordFailure(DIAG_RECON_EMPTY_VERSION, "Empty Version");
       return true;
     }
     std::string version_modifier =
         chrome::VersionInfo::GetVersionStringModifier();
     if (!version_modifier.empty())
       current_version += " " + version_modifier;
 #if defined(GOOGLE_CHROME_BUILD)
@@ skipping 56 matching lines @@
 
 DiagnosticsTest* MakeResourcesFileTest() {
   return new PathTest(kPathsToTest[2]);
 }
 
 DiagnosticsTest* MakeUserDirTest() { return new PathTest(kPathsToTest[3]); }
 
 DiagnosticsTest* MakeVersionTest() { return new VersionTest(); }
 
 }  // namespace diagnostics