In PopularSites, parse (not sanitize) JSON safely.

chrome/browser/android/ntp/popular_sites.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_
 #define CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
+namespace base {
+class Value;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 namespace variations {
 class VariationsService;
@@ skipping 93 matching lines @@
                       std::unique_ptr<std::string> data,
                       bool success);
 
   // Fetch the popular sites at the given URL, overwriting any file that already
   // exists.
   void FetchPopularSites(const GURL& url);
 
   // net::URLFetcherDelegate implementation.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
-  void OnJsonSanitized(const std::string& valid_minified_json);
-  void OnJsonSanitizationFailed(const std::string& error_message);
-  void OnFileWriteDone(const std::string& json, bool success);
-  void ParseSiteList(const std::string& json);
-  void OnJsonParsed(std::unique_ptr<std::vector<Site>> sites);
+  void OnJsonParsed(bool write_to_file, std::unique_ptr<base::Value> json);
+  void OnJsonParseFailed(const std::string& error_message);
+  void OnFileWriteDone(std::unique_ptr<base::Value> json, bool success);
+  void ParseSiteList(std::unique_ptr<base::Value> json);
+  void OnJsonUnmarshaled(std::unique_ptr<std::vector<Site>> sites);
   void OnDownloadFailed();
 
   FinishedCallback callback_;
   std::unique_ptr<net::URLFetcher> fetcher_;
   bool is_fallback_;
   std::vector<Site> sites_;
   std::string pending_country_;
   std::string pending_version_;
 
   base::FilePath local_path_;
 
   PrefService* prefs_;
   net::URLRequestContextGetter* download_context_;
 
   scoped_refptr<base::TaskRunner> blocking_runner_;
 
   base::WeakPtrFactory<PopularSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PopularSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_POPULAR_SITES_H_