Clean up PrefServiceBuilder

chrome/chrome_tests_unit.gypi

 # Copyright 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.
 {
   'targets': [
     {
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': 'static_library',
@@ skipping 153 matching lines @@
         'browser/policy/cloud/policy_builder.cc',
         'browser/policy/cloud/policy_builder.h',
         'browser/policy/mock_configuration_policy_provider.cc',
         'browser/policy/mock_configuration_policy_provider.h',
         'browser/policy/preferences_mock_mac.cc',
         'browser/policy/preferences_mock_mac.h',
         'browser/policy/test/local_policy_test_server.cc',
         'browser/policy/test/local_policy_test_server.h',
         'browser/policy/test/policy_test_utils.cc',
         'browser/policy/test/policy_test_utils.h',
-        'browser/prefs/pref_service_mock_builder.cc',
-        'browser/prefs/pref_service_mock_builder.h',
+        'browser/prefs/pref_service_mock_factory.cc',
+        'browser/prefs/pref_service_mock_factory.h',
         'browser/profile_resetter/profile_resetter_test_base.cc',
         'browser/profile_resetter/profile_resetter_test_base.h',
         'browser/search_engines/template_url_service_test_util.cc',
         'browser/search_engines/template_url_service_test_util.h',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
         'browser/signin/fake_profile_oauth2_token_service.cc',
         'browser/signin/fake_profile_oauth2_token_service.h',
         'browser/signin/fake_signin_manager.cc',
         'browser/signin/fake_signin_manager.h',
@@ skipping 2746 matching lines @@
               'sources': [
                 'browser/ui/views/app_list/win/app_list_win_unittest.cc',
               ],
             }],  # 'OS=="win"'
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }