diff options
| author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 16:38:43 +0000 |
|---|---|---|
| committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 16:38:43 +0000 |
| commit | 1a1e287c88ccc1c4ca2a587a2e9f4efc08a40dac (patch) | |
| tree | 066524f557d1e15f8805e2374426c4a960c95db7 | |
| parent | 5184dcb776f5ef7b07ea13e8129fdbe8b033b3b0 (diff) | |
| download | chromium_src-1a1e287c88ccc1c4ca2a587a2e9f4efc08a40dac.zip chromium_src-1a1e287c88ccc1c4ca2a587a2e9f4efc08a40dac.tar.gz chromium_src-1a1e287c88ccc1c4ca2a587a2e9f4efc08a40dac.tar.bz2 | |
Fixes update step to not clobber client code setting if toast experiment is not active.
R=finnur
BUG=67229
TEST=Install Chrome, wait for an auto-update, client code should not be set.
Review URL: http://codereview.chromium.org/5943005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69835 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc index 5289fb8..c2fb5ca 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -591,11 +591,15 @@ void GoogleChromeDistribution::LaunchUserExperiment( // chrome user data directory. FilePath user_data_dir(installation.GetUserDataPath()); - // TODO(cpu): re-enable experiment. - const int kThirtyDays = 3000 * 24; + const bool experiment_enabled = false; + const int kThirtyDays = 30 * 24; + int dir_age_hours = GetDirectoryWriteAgeInHours( user_data_dir.value().c_str()); - if (dir_age_hours < 0) { + if (!experiment_enabled) { + VLOG(1) << "Toast experiment is disabled."; + return; + } else if (dir_age_hours < 0) { // This means that we failed to find the user data dir. The most likely // cause is that this user has not ever used chrome at all which can // happen in a system-level install. |