From 2134467544d735dcb070dbab1e8bb7936322b51c Mon Sep 17 00:00:00 2001 From: "gab@chromium.org" Date: Thu, 7 Nov 2013 06:04:28 +0000 Subject: 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 --- chrome/chrome_installer.gypi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'chrome/chrome_installer.gypi') 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', -- cgit v1.1