summaryrefslogtreecommitdiffstats
path: root/chrome/browser/upgrade_detector.cc
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 00:40:17 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-18 00:40:17 +0000
commit30c918084bac874b6cfaabb93f0bb2545c5354e2 (patch)
tree45bd81ec93407433426c0a6d1421bc189a96c2c4 /chrome/browser/upgrade_detector.cc
parentd9cb161850584e5d277b141aadb68abec0af28bb (diff)
downloadchromium_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/browser/upgrade_detector.cc')
-rw-r--r--chrome/browser/upgrade_detector.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index 2e0eeed..7f3161d 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -113,6 +113,10 @@ class DetectUpgradeTask : public Task {
// 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";
+ return;
+ }
scoped_ptr<Version> running_version(
Version::GetVersionFromString(version_info.Version()));
if (running_version.get() == NULL) {