Simplify VersionInfo code, avoid hitting sandbox IPC constantly on Windows

chrome/browser/search_engines/ui_thread_search_terms_data.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/search_engines/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
@@ skipping 160 matching lines @@
 #endif  // defined(ENABLE_THEMES)
 
   return std::string();
 }
 
 // It's acutally OK to call this method on any thread, but it's currently placed
 // in UIThreadSearchTermsData since SearchTermsData cannot depend on
 // VersionInfo.
 std::string UIThreadSearchTermsData::GoogleImageSearchSource() const {
   chrome::VersionInfo version_info;
-  if (version_info.is_valid()) {
-    std::string version(version_info.Name() + " " + version_info.Version());
-    if (version_info.IsOfficialBuild())
-      version += " (Official)";
-    version += " " + version_info.OSType();
-    std::string modifier(version_info.GetVersionStringModifier());
-    if (!modifier.empty())
-      version += " " + modifier;
-    return version;
-  }
-  return "unknown";
+  std::string version(version_info.Name() + " " + version_info.Version());
+  if (version_info.IsOfficialBuild())
+    version += " (Official)";
+  version += " " + version_info.OSType();
+  std::string modifier(version_info.GetVersionStringModifier());
+  if (!modifier.empty())
+    version += " " + modifier;
+  return version;
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }