3 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/data/pref_service/invalid.json b/chrome/test/data/pref_service/invalid.json
new file mode 100644
index 0000000..43392a9
--- /dev/null
+++ b/chrome/test/data/pref_service/invalid.json
@@ -0,0 +1 @@
+!@#$%^&
+\ No newline at end of file
diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index fb673b9..eba821a 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -48,6 +48,7 @@
 #include "base/test/test_file_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_version_info.h"
+#include "chrome/browser/json_pref_store.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/chrome_constants.h"
@@ -526,7 +527,8 @@ class PageLoadTest : public UITest {
     FilePath local_state_path = user_data_dir()
         .Append(chrome::kLocalStateFilename);
 
-    PrefService* local_state(new PrefService(local_state_path));
+    PrefService* local_state(new PrefService(
+        new JsonPrefStore(local_state_path)));
     return local_state;
   }
 
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index b4e97d5..7c293e9 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -18,6 +18,7 @@
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
+#include "chrome/browser/json_pref_store.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
@@ -146,7 +147,7 @@ class TestingProfile : public Profile {
     if (!prefs_.get()) {
       FilePath prefs_filename =
           path_.Append(FILE_PATH_LITERAL("TestPreferences"));
-      prefs_.reset(new PrefService(prefs_filename));
+      prefs_.reset(new PrefService(new JsonPrefStore(prefs_filename)));
       Profile::RegisterUserPrefs(prefs_.get());
       browser::RegisterAllPrefs(prefs_.get(), prefs_.get());
     }