Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1590)

Unified Diff: base/prefs/testing_pref_service.h

Issue 753603002: Change preference APIs to take std::string instead of const char*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed all calls to c_str() in prefs. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/prefs/scoped_user_pref_update.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/prefs/testing_pref_service.h
diff --git a/base/prefs/testing_pref_service.h b/base/prefs/testing_pref_service.h
index 2f6d4940c81dc8d0cf9b868479c5a77fae4c80aa..40fd66a8e61c29f39af5e8efed64f67686329785 100644
--- a/base/prefs/testing_pref_service.h
+++ b/base/prefs/testing_pref_service.h
@@ -27,25 +27,25 @@ class TestingPrefServiceBase : public SuperPrefService {
// Read the value of a preference from the managed layer. Returns NULL if the
// preference is not defined at the managed layer.
- const base::Value* GetManagedPref(const char* path) const;
+ const base::Value* GetManagedPref(const std::string& path) const;
// Set a preference on the managed layer and fire observers if the preference
// changed. Assumes ownership of |value|.
- void SetManagedPref(const char* path, base::Value* value);
+ void SetManagedPref(const std::string& path, base::Value* value);
// Clear the preference on the managed layer and fire observers if the
// preference has been defined previously.
- void RemoveManagedPref(const char* path);
+ void RemoveManagedPref(const std::string& path);
// Similar to the above, but for user preferences.
- const base::Value* GetUserPref(const char* path) const;
- void SetUserPref(const char* path, base::Value* value);
- void RemoveUserPref(const char* path);
+ const base::Value* GetUserPref(const std::string& path) const;
+ void SetUserPref(const std::string& path, base::Value* value);
+ void RemoveUserPref(const std::string& path);
// Similar to the above, but for recommended policy preferences.
- const base::Value* GetRecommendedPref(const char* path) const;
- void SetRecommendedPref(const char* path, base::Value* value);
- void RemoveRecommendedPref(const char* path);
+ const base::Value* GetRecommendedPref(const std::string& path) const;
+ void SetRecommendedPref(const std::string& path, base::Value* value);
+ void RemoveRecommendedPref(const std::string& path);
// Do-nothing implementation for TestingPrefService.
static void HandleReadError(PersistentPrefStore::PrefReadError error) {}
@@ -62,14 +62,15 @@ class TestingPrefServiceBase : public SuperPrefService {
// Reads the value of the preference indicated by |path| from |pref_store|.
// Returns NULL if the preference was not found.
const base::Value* GetPref(TestingPrefStore* pref_store,
- const char* path) const;
+ const std::string& path) const;
// Sets the value for |path| in |pref_store|.
- void SetPref(TestingPrefStore* pref_store, const char* path,
+ void SetPref(TestingPrefStore* pref_store,
+ const std::string& path,
base::Value* value);
// Removes the preference identified by |path| from |pref_store|.
- void RemovePref(TestingPrefStore* pref_store, const char* path);
+ void RemovePref(TestingPrefStore* pref_store, const std::string& path);
// Pointers to the pref stores our value store uses.
scoped_refptr<TestingPrefStore> managed_prefs_;
@@ -110,88 +111,83 @@ TestingPrefServiceBase<
SuperPrefService, ConstructionPrefRegistry>::~TestingPrefServiceBase() {
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
+template <class SuperPrefService, class ConstructionPrefRegistry>
const base::Value* TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::GetManagedPref(
- const char* path) const {
+ SuperPrefService,
+ ConstructionPrefRegistry>::GetManagedPref(const std::string& path) const {
return GetPref(managed_prefs_.get(), path);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::SetManagedPref(
- const char* path, base::Value* value) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ SetManagedPref(const std::string& path, base::Value* value) {
SetPref(managed_prefs_.get(), path, value);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::RemoveManagedPref(
- const char* path) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ RemoveManagedPref(const std::string& path) {
RemovePref(managed_prefs_.get(), path);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-const base::Value* TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::GetUserPref(
- const char* path) const {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+const base::Value*
+TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::GetUserPref(
+ const std::string& path) const {
return GetPref(user_prefs_.get(), path);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::SetUserPref(
- const char* path, base::Value* value) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ SetUserPref(const std::string& path, base::Value* value) {
SetPref(user_prefs_.get(), path, value);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::RemoveUserPref(
- const char* path) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ RemoveUserPref(const std::string& path) {
RemovePref(user_prefs_.get(), path);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-const base::Value* TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::GetRecommendedPref(
- const char* path) const {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+const base::Value*
+TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ GetRecommendedPref(const std::string& path) const {
return GetPref(recommended_prefs_, path);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::SetRecommendedPref(
- const char* path, base::Value* value) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ SetRecommendedPref(const std::string& path, base::Value* value) {
SetPref(recommended_prefs_.get(), path, value);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::RemoveRecommendedPref(
- const char* path) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ RemoveRecommendedPref(const std::string& path) {
RemovePref(recommended_prefs_.get(), path);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-const base::Value* TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::GetPref(
- TestingPrefStore* pref_store, const char* path) const {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+const base::Value*
+TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::GetPref(
+ TestingPrefStore* pref_store,
+ const std::string& path) const {
const base::Value* res;
return pref_store->GetValue(path, &res) ? res : NULL;
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::SetPref(
- TestingPrefStore* pref_store, const char* path, base::Value* value) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ SetPref(TestingPrefStore* pref_store,
+ const std::string& path,
+ base::Value* value) {
pref_store->SetValue(path, value);
}
-template<class SuperPrefService, class ConstructionPrefRegistry>
-void TestingPrefServiceBase<
- SuperPrefService, ConstructionPrefRegistry>::RemovePref(
- TestingPrefStore* pref_store, const char* path) {
+template <class SuperPrefService, class ConstructionPrefRegistry>
+void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::
+ RemovePref(TestingPrefStore* pref_store, const std::string& path) {
pref_store->RemoveValue(path);
}
« no previous file with comments | « base/prefs/scoped_user_pref_update.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698