Make JSONParser a pure interface.

chrome/browser/supervised_user/supervised_user_site_list.cc

Index: chrome/browser/supervised_user/supervised_user_site_list.cc
diff --git a/chrome/browser/supervised_user/supervised_user_site_list.cc b/chrome/browser/supervised_user/supervised_user_site_list.cc
index 9c4d547be7314209185967e01a50e91e2267758f..9b78e64252714a5732f72ebafd9f2b4de00fdbc8 100644
--- a/chrome/browser/supervised_user/supervised_user_site_list.cc
+++ b/chrome/browser/supervised_user/supervised_user_site_list.cc
@@ -25,8 +25,6 @@ const char kWhitelistKey[] = "whitelist";
 
 namespace {
 
-bool g_load_in_process = false;
-
 std::string ReadFileOnBlockingThread(const base::FilePath& path) {
   SCOPED_UMA_HISTOGRAM_TIMER("ManagedUsers.Whitelist.ReadDuration");
   std::string contents;
@@ -114,11 +112,6 @@ void SupervisedUserSiteList::Load(const base::FilePath& path,
       base::Bind(&SupervisedUserSiteList::ParseJson, path, callback));
 }
 
-// static
-void SupervisedUserSiteList::SetLoadInProcessForTesting(bool in_process) {
-  g_load_in_process = in_process;
-}
-
 SupervisedUserSiteList::SupervisedUserSiteList(const base::ListValue& sites) {
   for (const base::Value* site : sites) {
     const base::DictionaryValue* entry = nullptr;
@@ -142,26 +135,12 @@ void SupervisedUserSiteList::ParseJson(
     const base::FilePath& path,
     const SupervisedUserSiteList::LoadedCallback& callback,
     const std::string& json) {
-  if (g_load_in_process) {
-    JSONFileValueDeserializer deserializer(path);
-    std::string error;
-    scoped_ptr<base::Value> value(deserializer.Deserialize(nullptr, &error));
-    if (!value) {
-      HandleError(path, error);
-      return;
-    }
-
-    OnJsonParseSucceeded(path, base::TimeTicks(), callback, value.Pass());
-    return;
-  }
-
-  // TODO(bauerb): Use batch mode to load multiple whitelists?
-  scoped_refptr<safe_json::SafeJsonParser> parser(
-      new safe_json::SafeJsonParser(
-          json, base::Bind(&SupervisedUserSiteList::OnJsonParseSucceeded, path,
-                           base::TimeTicks::Now(), callback),
-          base::Bind(&HandleError, path)));
-  parser->Start();
+  // TODO(bauerb): Use JSONSanitizer to sanitize whitelists on installation
+  // instead of using the expensive SafeJsonParser on every load.
+  safe_json::SafeJsonParser::Parse(
+      json, base::Bind(&SupervisedUserSiteList::OnJsonParseSucceeded, path,
+                       base::TimeTicks::Now(), callback),
+      base::Bind(&HandleError, path));
 }
 
 // static