Remove BrowserFileSystemContext class (merge into SandboxedFSContext)

chrome/browser/net/chrome_url_request_context.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_number_conversions.h"
@@ skipping 832 matching lines @@
   // Set ChromeURLRequestContext members
   user_script_dir_path_ = other->user_script_dir_path_;
   appcache_service_ = other->appcache_service_;
   database_tracker_ = other->database_tracker_;
   chrome_cookie_policy_ = other->chrome_cookie_policy_;
   host_content_settings_map_ = other->host_content_settings_map_;
   host_zoom_map_ = other->host_zoom_map_;
   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_;
 }
 
 void ChromeURLRequestContext::OnAcceptLanguageChange(
     const std::string& accept_language) {
   CheckCurrentlyOnIOThread();
   accept_language_ =
       net::HttpUtil::GenerateAcceptLanguageHeader(accept_language);
 }
 
@@ skipping 48 matching lines @@
 
   if (profile->GetUserScriptMaster())
     user_script_dir_path_ = profile->GetUserScriptMaster()->user_script_dir();
 
   ssl_config_service_ = profile->GetSSLConfigService();
   profile_dir_path_ = profile->GetPath();
   cookie_monster_delegate_ = new ChromeCookieMonsterDelegate(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();
 }
 
 ChromeURLRequestContextFactory::~ChromeURLRequestContextFactory() {
   CheckCurrentlyOnIOThread();
 }
 
 void ChromeURLRequestContextFactory::ApplyProfileParametersToContext(
     ChromeURLRequestContext* context) {
   // Apply all the parameters. NOTE: keep this in sync with
   // ChromeURLRequestContextFactory(Profile*).
   context->set_is_media(is_media_);
   context->set_is_off_the_record(is_off_the_record_);
   context->set_accept_language(accept_language_);
   context->set_accept_charset(accept_charset_);
   context->set_referrer_charset(referrer_charset_);
   context->set_user_script_dir_path(user_script_dir_path_);
   context->set_host_content_settings_map(host_content_settings_map_);
   context->set_host_zoom_map(host_zoom_map_);
   context->set_transport_security_state(
       transport_security_state_);
   context->set_ssl_config_service(ssl_config_service_);
   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_);
 }