Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/metrics/variations/variations_service_unittest.cc

 // 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.
 
 #include "base/base64.h"
 #include "base/string_split.h"
 #include "chrome/browser/metrics/proto/study.pb.h"
 #include "chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h"
 #include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/common/chrome_version_info.h"
@@ skipping 322 matching lines @@
     study.set_expiry_date(TimeToProtoTime(expiry_test_cases[i].expiry_date));
     const bool result = VariationsService::IsStudyExpired(study, now);
     EXPECT_EQ(expiry_test_cases[i].expected_result, result)
         << "Case " << i << " failed!";
   }
 }
 
 TEST(VariationsServiceTest, LoadSeed) {
   TestingPrefServiceSimple pref_service;
 
-  VariationsService::RegisterPrefs(&pref_service);
+  VariationsService::RegisterPrefs(pref_service.registry());
 
   // Store good seed data to test if loading from prefs works.
   TrialsSeed seed = CreateTestSeed();
 
   std::string serialized_seed;
   seed.SerializeToString(&serialized_seed);
   std::string base64_serialized_seed;
   ASSERT_TRUE(base::Base64Encode(serialized_seed, &base64_serialized_seed));
   pref_service.SetString(prefs::kVariationsSeed, base64_serialized_seed);
 
@@ skipping 19 matching lines @@
       pref_service.FindPreference(prefs::kVariationsSeed)->IsDefaultValue());
   EXPECT_FALSE(
       variations_service.LoadTrialsSeedFromPref(&pref_service, &loaded_seed));
   EXPECT_TRUE(
       pref_service.FindPreference(prefs::kVariationsSeed)->IsDefaultValue());
 }
 
 TEST(VariationsServiceTest, StoreSeed) {
   TestingPrefServiceSimple pref_service;
 
-  VariationsService::RegisterPrefs(&pref_service);
+  VariationsService::RegisterPrefs(pref_service.registry());
   const base::Time now = base::Time::Now();
 
   TrialsSeed seed = CreateTestSeed();
 
   TestVariationsService variations_service(new TestRequestAllowedNotifier);
   std::string serialized_seed;
   seed.SerializeToString(&serialized_seed);
   EXPECT_TRUE(
       variations_service.StoreSeedData(serialized_seed, now, &pref_service));
   // Make sure the pref was actually set.
@@ skipping 118 matching lines @@
   // manipulate it for this test.
   TestRequestAllowedNotifier* test_notifier = new TestRequestAllowedNotifier;
   TestVariationsService test_service(test_notifier);
 
   test_notifier->SetRequestsAllowedOverride(true);
   test_service.StartRepeatedVariationsSeedFetch();
   EXPECT_TRUE(test_service.fetch_attempted());
 }
 
 }  // namespace chrome_variations