Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: chrome/browser/plugins/plugins_resource_service.cc

Issue 1291543004: Inject JSON parsing in WebResource as a callback rather than inheritance (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webResources1
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/plugins/plugins_resource_service.cc
diff --git a/chrome/browser/plugins/plugins_resource_service.cc b/chrome/browser/plugins/plugins_resource_service.cc
index 441944945d1ddfa8de150eadeacc560fe964d300..4dee5438dc0419a57214a7683ea70448aaf35b5d 100644
--- a/chrome/browser/plugins/plugins_resource_service.cc
+++ b/chrome/browser/plugins/plugins_resource_service.cc
@@ -4,12 +4,15 @@
#include "chrome/browser/plugins/plugins_resource_service.h"
+#include "base/bind.h"
#include "base/command_line.h"
#include "base/prefs/pref_registry_simple.h"
#include "base/prefs/pref_service.h"
+#include "chrome/browser/browser_process.h"
#include "chrome/browser/plugins/plugin_finder.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
+#include "components/safe_json/safe_json_parser.h"
#include "url/gurl.h"
namespace {
@@ -41,13 +44,16 @@ GURL GetPluginsServerURL() {
} // namespace
PluginsResourceService::PluginsResourceService(PrefService* local_state)
- : ChromeWebResourceService(local_state,
- GetPluginsServerURL(),
- false,
- prefs::kPluginsResourceCacheUpdate,
- kStartResourceFetchDelayMs,
- kCacheUpdateDelayMs) {
-}
+ : web_resource::WebResourceService(
+ local_state,
+ GetPluginsServerURL(),
+ std::string(),
+ prefs::kPluginsResourceCacheUpdate,
+ kStartResourceFetchDelayMs,
+ kCacheUpdateDelayMs,
+ g_browser_process->system_request_context(),
+ switches::kDisableBackgroundNetworking,
+ base::Bind(safe_json::SafeJsonParser::Parse)) {}
void PluginsResourceService::Init() {
const base::DictionaryValue* metadata =
« no previous file with comments | « chrome/browser/plugins/plugins_resource_service.h ('k') | chrome/browser/web_resource/chrome_web_resource_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698