diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 14:21:16 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 14:21:16 +0000 |
| commit | 7457f42bbecd3466a723bd09075e6dd97307e3e3 (patch) | |
| tree | 0b8aad2452424aa04ecfd652693fdc71e64f7756 /chrome | |
| parent | b7ecfecbee2f06ea6b35ccf29dcdaa384d39b0fb (diff) | |
| download | chromium_src-7457f42bbecd3466a723bd09075e6dd97307e3e3.zip chromium_src-7457f42bbecd3466a723bd09075e6dd97307e3e3.tar.gz chromium_src-7457f42bbecd3466a723bd09075e6dd97307e3e3.tar.bz2 | |
Changes version string looked for in about:version to match that of
version string written by OS.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/194017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/chromeos_version_loader.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/chromeos_version_loader_unittest.cc | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/chromeos_version_loader.cc b/chrome/browser/chromeos/chromeos_version_loader.cc index 1bb075e..a7b4018 100644 --- a/chrome/browser/chromeos/chromeos_version_loader.cc +++ b/chrome/browser/chromeos/chromeos_version_loader.cc @@ -12,7 +12,7 @@ #include "chrome/browser/browser_process.h" // Beginning of line we look for that gives version number. -static const char kPrefix[] = "GOOGLE_RELEASE="; +static const char kPrefix[] = "CHROMEOS_RELEASE_DESCRIPTION="; // File to look for version number in. static const char kPath[] = "/etc/lsb-release"; diff --git a/chrome/browser/chromeos/chromeos_version_loader_unittest.cc b/chrome/browser/chromeos/chromeos_version_loader_unittest.cc index 1b0bdd0..0e6b206 100644 --- a/chrome/browser/chromeos/chromeos_version_loader_unittest.cc +++ b/chrome/browser/chromeos/chromeos_version_loader_unittest.cc @@ -8,11 +8,12 @@ typedef testing::Test ChromeOSVersionLoaderTest; -static const char kTest1[] = "DIST_ID=1\nGOOGLE_RELEASE=0.2.3.3\nFOO=BAR"; -static const char kTest2[] = "DIST_ID=1\nGOOGLE_RELEASE=0.2.3.3"; -static const char kTest3[] = "GOOGLE_RELEASE=\"0.2.3.3\""; -static const char kTest4[] = "GOOGLE_RELEASE=\"\"\""; -static const char kTest5[] = "GOOGLE_RELEASE=\"\""; +static const char kTest1[] = + "DIST_ID=1\nCHROMEOS_RELEASE_DESCRIPTION=0.2.3.3\nFOO=BAR"; +static const char kTest2[] = "DIST_ID=1\nCHROMEOS_RELEASE_DESCRIPTION=0.2.3.3"; +static const char kTest3[] = "CHROMEOS_RELEASE_DESCRIPTION=\"0.2.3.3\""; +static const char kTest4[] = "CHROMEOS_RELEASE_DESCRIPTION=\"\"\""; +static const char kTest5[] = "CHROMEOS_RELEASE_DESCRIPTION=\"\""; TEST_F(ChromeOSVersionLoaderTest, ParseVersion) { EXPECT_EQ("0.2.3.3", ChromeOSVersionLoader::ParseVersion(kTest1)); |