summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
authordroger <droger@chromium.org>2015-01-27 02:20:23 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-27 10:21:06 +0000
commit13cf36de637ac1f4da4e5beb9197af29017ba6c5 (patch)
treee1c89ab021101ec891da173df7092d696d51cfbb /ios
parent9593e7af0db1f65bb438fa0ccfa20ea90bedbecf (diff)
downloadchromium_src-13cf36de637ac1f4da4e5beb9197af29017ba6c5.zip
chromium_src-13cf36de637ac1f4da4e5beb9197af29017ba6c5.tar.gz
chromium_src-13cf36de637ac1f4da4e5beb9197af29017ba6c5.tar.bz2
WebResourceService is no longer reference counted
WebResourceService was extending its own lifetime while network requests were in progress. This was not needed, and made the lifetime management of request contexts harder. This CL removes this behavior and cancels the requests when the service is deleted. Finally, the virtual method GetRequestContext(), which was a workaround for the lifetime issues, is removed. BUG=447575 Review URL: https://codereview.chromium.org/872703003 Cr-Commit-Position: refs/heads/master@{#313254}
Diffstat (limited to 'ios')
-rw-r--r--ios/chrome/browser/web_resource/ios_web_resource_service.cc5
-rw-r--r--ios/chrome/browser/web_resource/ios_web_resource_service.h1
2 files changed, 1 insertions, 5 deletions
diff --git a/ios/chrome/browser/web_resource/ios_web_resource_service.cc b/ios/chrome/browser/web_resource/ios_web_resource_service.cc
index 5d538c9..44458bb7 100644
--- a/ios/chrome/browser/web_resource/ios_web_resource_service.cc
+++ b/ios/chrome/browser/web_resource/ios_web_resource_service.cc
@@ -40,6 +40,7 @@ IOSWebResourceService::IOSWebResourceService(
last_update_time_pref_name,
start_fetch_delay_ms,
cache_update_delay_ms,
+ GetApplicationContext()->GetSystemURLRequestContext(),
nullptr) {
}
@@ -75,7 +76,3 @@ void IOSWebResourceService::ParseJSON(const std::string& data,
success_callback, error_callback),
base::Bind(&RunClosure));
}
-
-net::URLRequestContextGetter* IOSWebResourceService::GetRequestContext() {
- return GetApplicationContext()->GetSystemURLRequestContext();
-}
diff --git a/ios/chrome/browser/web_resource/ios_web_resource_service.h b/ios/chrome/browser/web_resource/ios_web_resource_service.h
index c64de5d..fda5ec9 100644
--- a/ios/chrome/browser/web_resource/ios_web_resource_service.h
+++ b/ios/chrome/browser/web_resource/ios_web_resource_service.h
@@ -37,7 +37,6 @@ class IOSWebResourceService : public web_resource::WebResourceService {
void ParseJSON(const std::string& data,
const SuccessCallback& success_callback,
const ErrorCallback& error_callback) override;
- net::URLRequestContextGetter* GetRequestContext() override;
DISALLOW_COPY_AND_ASSIGN(IOSWebResourceService);
};