Make JSONParser a pure interface.

chrome/browser/supervised_user/supervised_user_site_list.cc

 // Copyright 2014 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/supervised_user/supervised_user_site_list.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "components/safe_json/safe_json_parser.h"
 #include "content/public/browser/browser_thread.h"
 #include "url/gurl.h"
 
 const int kSitelistFormatVersion = 1;
 
 const char kHostnameHashesKey[] = "hostname_hashes";
 const char kNameKey[] = "name";
 const char kSitesKey[] = "sites";
 const char kSitelistFormatVersionKey[] = "version";
 const char kUrlKey[] = "url";
 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;
   base::ReadFileToString(path, &contents);
   return contents;
 }
 
 void HandleError(const base::FilePath& path, const std::string& error) {
   LOG(ERROR) << "Couldn't load site list " << path.value() << ": " << error;
 }
@@ skipping 67 matching lines @@
                                   const LoadedCallback& callback) {
   base::PostTaskAndReplyWithResult(
       content::BrowserThread::GetBlockingPool()
           ->GetTaskRunnerWithShutdownBehavior(
               base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN).get(),
       FROM_HERE,
       base::Bind(&ReadFileOnBlockingThread, 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;
     if (!site->GetAsDictionary(&entry)) {
       LOG(ERROR) << "Entry is invalid";
       continue;
     }
 
     base::string16 name;
     entry->GetString(kNameKey, &name);
     sites_.push_back(Site(name));
     AddWhitelistEntries(entry, &sites_.back());
   }
 }
 
 SupervisedUserSiteList::~SupervisedUserSiteList() {
 }
 
 // static
 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
 void SupervisedUserSiteList::OnJsonParseSucceeded(
     const base::FilePath& path,
     base::TimeTicks start_time,
     const SupervisedUserSiteList::LoadedCallback& callback,
     scoped_ptr<base::Value> value) {
   if (!start_time.is_null()) {
     UMA_HISTOGRAM_TIMES("ManagedUsers.Whitelist.JsonParseDuration",
@@ skipping 18 matching lines @@
   }
 
   base::ListValue* sites = nullptr;
   if (!dict->GetList(kSitesKey, &sites)) {
     LOG(ERROR) << "Site list " << path.value() << " does not contain any sites";
     return;
   }
 
   callback.Run(make_scoped_refptr(new SupervisedUserSiteList(*sites)));
 }