Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(915)

Unified Diff: chrome/common/service_process_util.cc

Issue 5815001: Fixed file_version_info so that it finds Mac values correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed logging to vlog Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/service_process_util.cc
diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc
index 81899b65534409cd07de3e5e8525e5ec05f58575..19cd3805750252810f659e3d5e73fc9361adc3f1 100644
--- a/chrome/common/service_process_util.cc
+++ b/chrome/common/service_process_util.cc
@@ -84,12 +84,6 @@ ServiceProcessRunningState GetServiceProcessRunningState(
// Get the version of the currently *running* instance of Chrome.
chrome::VersionInfo version_info;
- if (!version_info.is_valid()) {
- NOTREACHED() << "Failed to get current file version";
- // Our own version is invalid. This is an error case. Pretend that we
- // are out of date.
- return SERVICE_NEWER_VERSION_RUNNING;
- }
scoped_ptr<installer::Version> running_version(
installer::Version::GetVersionFromString(
ASCIIToUTF16(version_info.Version())));
@@ -133,7 +127,6 @@ std::string GetServiceProcessScopedVersionedName(
const std::string& append_str) {
std::string versioned_str;
chrome::VersionInfo version_info;
- DCHECK(version_info.is_valid());
versioned_str.append(version_info.Version());
versioned_str.append(append_str);
return GetServiceProcessScopedName(versioned_str);
@@ -201,10 +194,6 @@ bool ServiceProcessState::HandleOtherVersion() {
bool ServiceProcessState::CreateSharedData() {
chrome::VersionInfo version_info;
- if (!version_info.is_valid()) {
- NOTREACHED() << "Failed to get current file version";
- return false;
- }
if (version_info.Version().length() >= kMaxVersionStringLength) {
NOTREACHED() << "Version string length is << " <<
version_info.Version().length() << "which is longer than" <<

Powered by Google App Engine
This is Rietveld 408576698