diff options
| author | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 06:04:28 +0000 |
|---|---|---|
| committer | gab@chromium.org <gab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 06:04:28 +0000 |
| commit | 2134467544d735dcb070dbab1e8bb7936322b51c (patch) | |
| tree | d715376971801b0a26f54c77fc91936c0c4f36ad /chrome/chrome_installer.gypi | |
| parent | f6eb6edb6c17031ef1ef29d7466959518ffd37c2 (diff) | |
| download | chromium_src-2134467544d735dcb070dbab1e8bb7936322b51c.zip chromium_src-2134467544d735dcb070dbab1e8bb7936322b51c.tar.gz chromium_src-2134467544d735dcb070dbab1e8bb7936322b51c.tar.bz2 | |
GCAPI should append to the existing experiment_labels instead of clobbering them.
As described on http://crbug.com/266955#c7
Also adding AtExitManager to gcapi_test.exe; this is required to support MasterPreferences's LazyInstance used by BrowserDistribution, used by google_update's ReadExperimentLabels().
Introducing GCAPITestRegistryOverrider as a class to be added as a member to GCAPI test fixtures that require registry overriding; extracted from the existing GCAPIReactivationTest fixture.
Move Windows-specific variations_util.cc code to experiment_labels_win.cc
BUG=266955
TEST=gcapi_test.exe
Review URL: https://codereview.chromium.org/23579003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index d1d6c21..c424e77 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -65,7 +65,10 @@ ], 'sources': [ 'installer/gcapi/gcapi_last_run_test.cc', + 'installer/gcapi/gcapi_omaha_experiment_test.cc', 'installer/gcapi/gcapi_reactivation_test.cc', + 'installer/gcapi/gcapi_test_registry_overrider.cc', + 'installer/gcapi/gcapi_test_registry_overrider.h', 'installer/gcapi/gcapi_test.cc', 'installer/gcapi/gcapi_test.rc', 'installer/gcapi/resource.h', |