summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/chrome_url_request_context.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc15
1 files changed, 3 insertions, 12 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 4c8a7c5..d96fbc0 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -10,16 +10,14 @@
#include "base/synchronization/waitable_event.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/io_thread.h"
+#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_service.h"
#include "net/base/cookie_store.h"
-#include "net/ftp/ftp_transaction_factory.h"
-#include "net/http/http_transaction_factory.h"
#include "net/http/http_util.h"
#include "webkit/glue/webkit_glue.h"
@@ -363,21 +361,17 @@ void ChromeURLRequestContext::CopyFrom(ChromeURLRequestContext* other) {
URLRequestContext::CopyFrom(other);
// Copy ChromeURLRequestContext parameters.
- set_appcache_service(other->appcache_service());
- set_blob_storage_context(other->blob_storage_context());
- set_file_system_context(other->file_system_context());
- set_extension_info_map(other->extension_info_map_);
// ChromeURLDataManagerBackend is unique per context.
set_is_incognito(other->is_incognito());
}
ChromeURLDataManagerBackend*
ChromeURLRequestContext::chrome_url_data_manager_backend() const {
- return chrome_url_data_manager_backend_;
+ return chrome_url_data_manager_backend_;
}
void ChromeURLRequestContext::set_chrome_url_data_manager_backend(
- ChromeURLDataManagerBackend* backend) {
+ ChromeURLDataManagerBackend* backend) {
DCHECK(backend);
chrome_url_data_manager_backend_ = backend;
}
@@ -385,9 +379,6 @@ void ChromeURLRequestContext::set_chrome_url_data_manager_backend(
ChromeURLRequestContext::~ChromeURLRequestContext() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- if (appcache_service_.get() && appcache_service_->request_context() == this)
- appcache_service_->set_request_context(NULL);
-
NotificationService::current()->Notify(
chrome::NOTIFICATION_URL_REQUEST_CONTEXT_RELEASED,
Source<net::URLRequestContext>(this),