diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-12 23:43:09 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-12 23:43:09 +0000 |
| commit | f216f983d9bc056fe7b49311922cd7e772a40169 (patch) | |
| tree | 7a1f81e5e901630141257e0683fec113ceebc53c /chrome/installer/util/google_chrome_distribution.h | |
| parent | 9607f6a8933093f55aeb63580efba974597b7e40 (diff) | |
| download | chromium_src-f216f983d9bc056fe7b49311922cd7e772a40169.zip chromium_src-f216f983d9bc056fe7b49311922cd7e772a40169.tar.gz chromium_src-f216f983d9bc056fe7b49311922cd7e772a40169.tar.bz2 | |
Resubmit of r49346 that caused mysterious test failures on the bot.
Original change: Fix problem whereby the "-full" magic value is removed from the
"ap" value when a differential update for CF fails (it should remain unless the
update succeeds).
Also, fix problem with installer return codes being squashed. This was a
regression introduced in
http://src.chromium.org/viewvc/chrome?view=rev&revision=41322.
BUG=46051,40607
TEST=Cause a differential update to fail, observe that the "ap" value contains a
"-full".
TBR=ananta
Review URL: http://codereview.chromium.org/2737006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_distribution.h')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index 75999da..1be2f13 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -40,21 +40,6 @@ class GoogleChromeDistribution : public BrowserDistribution { virtual std::wstring GetInstallSubDir(); - // This method generates the new value for Google Update "ap" key for Chrome - // based on whether we are doing incremental install (or not) and whether - // the install succeeded. - // - If install worked, remove the magic string (if present). - // - If incremental installer failed, append a magic string (if - // not present already). - // - If full installer failed, still remove this magic - // string (if it is present already). - // - // diff_install: tells whether this is incremental install or not. - // install_status: if 0, means installation was successful. - // value: current value of Google Update "ap" key. - std::wstring GetNewGoogleUpdateApKey(bool diff_install, - installer_util::InstallStatus status, const std::wstring& value); - virtual std::wstring GetPublisherName(); virtual std::wstring GetAppDescription(); @@ -103,7 +88,7 @@ class GoogleChromeDistribution : public BrowserDistribution { private: friend class BrowserDistribution; - FRIEND_TEST(GoogleChromeDistributionTest, TestExtractUninstallMetrics); + FRIEND_TEST(GoogleChromeDistTest, TestExtractUninstallMetrics); // Extracts uninstall metrics from the JSON file located at file_path. // Returns them in a form suitable for appending to a url that already |