In PopularSites, parse (not sanitize) JSON safely.

chrome/browser/android/ntp/popular_sites.h

Index: chrome/browser/android/ntp/popular_sites.h
diff --git a/chrome/browser/android/ntp/popular_sites.h b/chrome/browser/android/ntp/popular_sites.h
index 40ac5cd67bcebc126a0942419bd4e6006bd47a50..b903ed719b116505e9afb7cf7190dd9dcc8860d7 100644
--- a/chrome/browser/android/ntp/popular_sites.h
+++ b/chrome/browser/android/ntp/popular_sites.h
@@ -17,6 +17,10 @@
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
+namespace base {
+class Value;
+}
+
 namespace net {
 class URLRequestContextGetter;
 }
@@ -130,11 +134,11 @@ class PopularSites : public net::URLFetcherDelegate {
   // 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);

[Marc Treib, 2016/06/02 11:39:55]

I think this doesn't exist anymore

[sfiera, 2016/06/02 12:44:19]

Done.

   void OnDownloadFailed();
 
   FinishedCallback callback_;