Use RegistryOverrideManager properly in RLZ tests.

rlz/rlz.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     'variables': {
       # Force rlz to use chrome's networking stack.
       'force_rlz_use_chrome_net%': 1,
@@ skipping 50 matching lines @@
         'mac/lib/rlz_value_store_mac.h',
         'win/lib/lib_mutex.cc',
         'win/lib/lib_mutex.h',
         'win/lib/machine_deal.cc',
         'win/lib/machine_deal.h',
         'win/lib/machine_id_win.cc',
         'win/lib/process_info.cc',
         'win/lib/process_info.h',
         'win/lib/registry_util.cc',
         'win/lib/registry_util.h',
-        'win/lib/rlz_lib.h',
         'win/lib/rlz_lib_win.cc',
         'win/lib/rlz_value_store_registry.cc',
         'win/lib/rlz_value_store_registry.h',
       ],
       'conditions': [
         ['rlz_use_chrome_net==1', {
           'defines': [
             'RLZ_NETWORK_IMPLEMENTATION_CHROME_NET',
           ],
           'direct_dependent_settings': {
@@ skipping 22 matching lines @@
         ['OS=="ios"', {
           'sources/': [
             ['include', '^mac/lib/rlz_value_store_mac\\.'],
           ],
         }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
     {
+      'target_name': 'test_support_rlz',
+      'type': 'static_library',
+      'dependencies': [
+        ':rlz_lib',
+        '../base/base.gyp:base',
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
+      ],
+      'sources': [
+        'test/rlz_test_helpers.cc',
+        'test/rlz_test_helpers.h',
+      ],
+    },
+    {
       'target_name': 'rlz_unittests',
       'type': 'executable',
       'dependencies': [
         ':rlz_lib',
+        ':test_support_rlz',
         '../base/base.gyp:base',
         '../base/base.gyp:base_prefs',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
       ],
       'sources': [
         'lib/crc32_unittest.cc',
         'lib/crc8_unittest.cc',
         'lib/financial_ping_test.cc',
         'lib/lib_values_unittest.cc',
         'lib/machine_id_unittest.cc',
         'lib/rlz_lib_test.cc',
         'lib/string_utils_unittest.cc',
-        'test/rlz_test_helpers.cc',
-        'test/rlz_test_helpers.h',
         'test/rlz_unittest_main.cc',
         'win/lib/machine_deal_test.cc',
       ],
       'conditions': [
         ['rlz_use_chrome_net==1', {
           'dependencies': [
             '../net/net.gyp:net_test_support',
           ],
         }],
       ],
@@ skipping 23 matching lines @@
           ],
           'dependencies': [
             ':rlz_lib',
             '../third_party/zlib/zlib.gyp:zlib',
           ],
         },
       ],
     }],
   ],
 }