Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

chrome/browser/prefs/pref_service.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 "chrome/browser/prefs/pref_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 327 matching lines @@
   DCHECK(CalledOnValidThread());
 
   PreferenceMap::iterator it = prefs_map_.find(path);
   CHECK(it != prefs_map_.end()) << "Trying to unregister an unregistered pref: "
                                 << path;
 
   prefs_map_.erase(it);
   default_store_->RemoveDefaultValue(path);
 }
 
+bool PrefService::AllowPrefRegistrarSimple() const {
+  return true;
+}
+
 void PrefService::ClearPref(const char* path) {
   DCHECK(CalledOnValidThread());
 
   const Preference* pref = FindPreference(path);
   if (!pref) {
     NOTREACHED() << "Trying to clear an unregistered pref: " << path;
     return;
   }
   user_pref_store_->RemoveValue(path);
 }
@@ skipping 209 matching lines @@
   const Value* found_value = NULL;
   if (pref_value_store_->GetValue(path, type, &found_value)) {
     DCHECK(found_value->IsType(type));
     return found_value;
   }
 
   // Every registered preference has at least a default value.
   NOTREACHED() << "no valid value found for registered pref " << path;
   return NULL;
 }