diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:40:17 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-18 00:40:17 +0000 |
| commit | 30c918084bac874b6cfaabb93f0bb2545c5354e2 (patch) | |
| tree | 45bd81ec93407433426c0a6d1421bc189a96c2c4 /chrome/common/service_process_util.cc | |
| parent | d9cb161850584e5d277b141aadb68abec0af28bb (diff) | |
| download | chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.zip chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.tar.gz chromium_src-30c918084bac874b6cfaabb93f0bb2545c5354e2.tar.bz2 | |
Revert 69592 - file_version_info was not finding Mac values correctly.
Changed file_version_info to find Mac values, and changed version_info to fail if values can't be found.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/5815001
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/6017003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/service_process_util.cc')
| -rw-r--r-- | chrome/common/service_process_util.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc index 4c22fda..bcbac69 100644 --- a/chrome/common/service_process_util.cc +++ b/chrome/common/service_process_util.cc @@ -82,6 +82,12 @@ 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<Version> running_version(Version::GetVersionFromString( version_info.Version())); if (!running_version.get()) { @@ -124,6 +130,7 @@ 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); @@ -191,6 +198,10 @@ 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" << |