Inject JSON parsing in WebResource as a callback rather than inheritance
commit73a6070e3cf6180e4b0f1b003605fdaf5586dbfa
authordroger <droger@chromium.org>
Tue, 25 Aug 2015 08:45:20 +0000 (25 01:45 -0700)
committerCommit bot <commit-bot@chromium.org>
Tue, 25 Aug 2015 08:45:51 +0000 (25 08:45 +0000)
tree7debb402089f668006262ff3d4b8decdb9daa68d
parent7fd54cd0b1dfa8f545b00ce645ae2d43b353606e
Inject JSON parsing in WebResource as a callback rather than inheritance

This CL replaces inheritance by composition to inject the JSON
parsing behavior.
It deletes the subclasses ChromeWebResourceService and
IOWebResourceService, and introduces
web_resource::ParseJSONCallback instead.

BUG=371477
TBR=jochen

Review URL: https://codereview.chromium.org/1291543004

Cr-Commit-Position: refs/heads/master@{#345286}
15 files changed:
chrome/browser/browser_process_impl.cc
chrome/browser/plugins/plugins_resource_service.cc
chrome/browser/plugins/plugins_resource_service.h
chrome/browser/web_resource/chrome_web_resource_service.cc [deleted file]
chrome/browser/web_resource/chrome_web_resource_service.h [deleted file]
chrome/browser/web_resource/promo_resource_service.cc
chrome/browser/web_resource/promo_resource_service.h
chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc
chrome/browser/web_resource/promo_resource_service_unittest.cc
chrome/chrome_browser.gypi
components/web_resource/web_resource_service.cc
components/web_resource/web_resource_service.h
ios/chrome/browser/web_resource/ios_web_resource_service.cc [deleted file]
ios/chrome/browser/web_resource/ios_web_resource_service.h [deleted file]
ios/chrome/ios_chrome.gyp