summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/chrome_url_request_context.cc
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 01:12:12 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-14 01:12:12 +0000
commitb7b82eb3dce4220e592472d0f9220280d1246243 (patch)
tree2fa55d5d932949d4a313ca3b7d8ed39fc9c81d11 /chrome/browser/net/chrome_url_request_context.cc
parenta097393e6e0f08f521c977677bed01a0ad01120b (diff)
downloadchromium_src-b7b82eb3dce4220e592472d0f9220280d1246243.zip
chromium_src-b7b82eb3dce4220e592472d0f9220280d1246243.tar.gz
chromium_src-b7b82eb3dce4220e592472d0f9220280d1246243.tar.bz2
Remove BrowserFileSystemContext class and merge it into SandboxedFileSystemContext
BUG=60243 TEST=none Review URL: http://codereview.chromium.org/5633008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_url_request_context.cc')
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 58b353f..530790e 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -850,7 +850,7 @@ ChromeURLRequestContext::ChromeURLRequestContext(
is_media_ = other->is_media_;
is_off_the_record_ = other->is_off_the_record_;
blob_storage_context_ = other->blob_storage_context_;
- browser_file_system_context_ = other->browser_file_system_context_;
+ file_system_context_ = other->file_system_context_;
extension_info_map_ = other->extension_info_map_;
}
@@ -919,7 +919,7 @@ ChromeURLRequestContextFactory::ChromeURLRequestContextFactory(Profile* profile)
appcache_service_ = profile->GetAppCacheService();
database_tracker_ = profile->GetDatabaseTracker();
blob_storage_context_ = profile->GetBlobStorageContext();
- browser_file_system_context_ = profile->GetFileSystemContext();
+ file_system_context_ = profile->GetFileSystemContext();
extension_info_map_ = profile->GetExtensionInfoMap();
}
@@ -945,6 +945,6 @@ void ChromeURLRequestContextFactory::ApplyProfileParametersToContext(
context->set_appcache_service(appcache_service_);
context->set_database_tracker(database_tracker_);
context->set_blob_storage_context(blob_storage_context_);
- context->set_browser_file_system_context(browser_file_system_context_);
+ context->set_file_system_context(file_system_context_);
context->set_extension_info_map(extension_info_map_);
}