Registry overriding doesn't seem to work across multiple processes prior to Win8, instead simply ha…

Registry overriding doesn't seem to work across multiple processes prior to Win8, instead simply have IEImporterTestRegistryOverrider set the key to be used in the environment; at runtime, if the key is set, use that instead of the default IE key.

This is a precursor CL to https://codereview.chromium.org/12670013/

BUG=219419
TEST=browser_tests --gtest_filter=IEImporterBrowserTest.* finally passes on Win7 (with and without https://codereview.chromium.org/12670013/).

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201696

[gab, 2013-05-22 19:16:41]

Sir, PTAL.

This should finally allow me to checkin
https://codereview.chromium.org/12670013/ :)!

Thanks!
Gab

[robertshield, 2013-05-22 19:31:35]

Generally looks good, one main comment on the interface.

https://codereview.chromium.org/15736014/diff/1/chrome/browser/importer/ie_im...
File chrome/browser/importer/ie_importer_test_registry_overrider_win.cc (right):

https://codereview.chromium.org/15736014/diff/1/chrome/browser/importer/ie_im...
chrome/browser/importer/ie_importer_test_registry_overrider_win.cc:50: if
(!GetTestKeyFromEnvironment(&key)) {
The environment is process-global, but override_initiated_ is local to an
instance of this class. So.. if two of these are created, this NOTREACHED will
be reached.

https://codereview.chromium.org/15736014/diff/1/chrome/browser/importer/ie_im...
chrome/browser/importer/ie_importer_test_registry_overrider_win.cc:77:
base::string16 IEImporterTestRegistryOverrider::GetTestRegistryOverride() {
// static

[gab, 2013-05-22 20:07:40]

PTAL.

Thanks!
Gab

https://codereview.chromium.org/15736014/diff/1/chrome/browser/importer/ie_im...
File chrome/browser/importer/ie_importer_test_registry_overrider_win.cc (right):

https://codereview.chromium.org/15736014/diff/1/chrome/browser/importer/ie_im...
chrome/browser/importer/ie_importer_test_registry_overrider_win.cc:50: if
(!GetTestKeyFromEnvironment(&key)) {
On 2013/05/22 19:31:35, robertshield wrote:
> The environment is process-global, but override_initiated_ is local to an
> instance of this class. So.. if two of these are created, this NOTREACHED will
> be reached.

Changed as discussed.

https://codereview.chromium.org/15736014/diff/1/chrome/browser/importer/ie_im...
chrome/browser/importer/ie_importer_test_registry_overrider_win.cc:77:
base::string16 IEImporterTestRegistryOverrider::GetTestRegistryOverride() {
On 2013/05/22 19:31:35, robertshield wrote:
> // static

Done.

[robertshield, 2013-05-22 20:13:56]

lgtm

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
File chrome/browser/importer/ie_importer_test_registry_overrider_win.h (right):

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
chrome/browser/importer/ie_importer_test_registry_overrider_win.h:12: //
HKEY_CURRENT_USER in tests. After the key has been generated via
nit: no via

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
File chrome/browser/importer/ie_importer_utils_win.cc (right):

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
chrome/browser/importer/ie_importer_utils_win.cc:20: // Return
kIEFavoritesOrderKey unless an override is on for tests.
nit: is on -> has been set

[gab, 2013-05-22 20:39:19]

Done, thanks!

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
File chrome/browser/importer/ie_importer_test_registry_overrider_win.h (right):

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
chrome/browser/importer/ie_importer_test_registry_overrider_win.h:12: //
HKEY_CURRENT_USER in tests. After the key has been generated via
On 2013/05/22 20:13:56, robertshield wrote:
> nit: no via

Done.

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
File chrome/browser/importer/ie_importer_utils_win.cc (right):

https://codereview.chromium.org/15736014/diff/5001/chrome/browser/importer/ie...
chrome/browser/importer/ie_importer_utils_win.cc:20: // Return
kIEFavoritesOrderKey unless an override is on for tests.
On 2013/05/22 20:13:56, robertshield wrote:
> nit: is on -> has been set

Done.

[commit-bot: I haz the power, 2013-05-22 20:40:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/15736014/12001

[commit-bot: I haz the power, 2013-05-23 04:44:34]

Change committed as 201696