Index: ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc |
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc |
index b9d5b88f17c3e9aa5db766da0bd546db49d2046a..9666503feeeab91324f4d8aaef3e0bfc9240fb28 100644 |
--- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc |
+++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc |
@@ -131,30 +131,6 @@ void ChromeBrowserStateIOData::InitializeOnUIThread( |
initialized_on_UI_thread_ = true; |
} |
-ChromeBrowserStateIOData::AppRequestContext::AppRequestContext() {} |
- |
-void ChromeBrowserStateIOData::AppRequestContext::SetCookieStore( |
- net::CookieStore* cookie_store) { |
- cookie_store_ = cookie_store; |
- set_cookie_store(cookie_store); |
-} |
- |
-void ChromeBrowserStateIOData::AppRequestContext::SetHttpTransactionFactory( |
- scoped_ptr<net::HttpTransactionFactory> http_factory) { |
- http_factory_ = std::move(http_factory); |
- set_http_transaction_factory(http_factory_.get()); |
-} |
- |
-void ChromeBrowserStateIOData::AppRequestContext::SetJobFactory( |
- scoped_ptr<net::URLRequestJobFactory> job_factory) { |
- job_factory_ = std::move(job_factory); |
- set_job_factory(job_factory_.get()); |
-} |
- |
-ChromeBrowserStateIOData::AppRequestContext::~AppRequestContext() { |
- AssertNoURLRequests(); |
-} |
- |
ChromeBrowserStateIOData::ProfileParams::ProfileParams() |
: io_thread(nullptr), browser_state(nullptr) {} |
@@ -172,31 +148,6 @@ ChromeBrowserStateIOData::~ChromeBrowserStateIOData() { |
if (web::WebThread::IsMessageLoopValid(web::WebThread::IO)) |
DCHECK_CURRENTLY_ON(web::WebThread::IO); |
- // Pull the contents of the request context maps onto the stack for sanity |
- // checking of values in a minidump. http://crbug.com/260425 |
- size_t num_app_contexts = app_request_context_map_.size(); |
- size_t current_context = 0; |
- static const size_t kMaxCachedContexts = 20; |
- net::URLRequestContext* app_context_cache[kMaxCachedContexts] = {0}; |
- void* app_context_vtable_cache[kMaxCachedContexts] = {0}; |
- void* tmp_vtable = nullptr; |
- base::debug::Alias(&num_app_contexts); |
- base::debug::Alias(¤t_context); |
- base::debug::Alias(app_context_cache); |
- base::debug::Alias(app_context_vtable_cache); |
- base::debug::Alias(&tmp_vtable); |
- |
- current_context = 0; |
- for (URLRequestContextMap::const_iterator |
- it = app_request_context_map_.begin(); |
- current_context < kMaxCachedContexts && |
- it != app_request_context_map_.end(); |
- ++it, ++current_context) { |
- app_context_cache[current_context] = it->second; |
- memcpy(&app_context_vtable_cache[current_context], |
- static_cast<void*>(it->second), sizeof(void*)); |
- } |
- |
// Destroy certificate_report_sender_ before main_request_context_, |
// since the former has a reference to the latter. |
if (transport_security_state_) |
@@ -207,19 +158,6 @@ ChromeBrowserStateIOData::~ChromeBrowserStateIOData() { |
// are already done in the URLRequestContext destructor. |
if (main_request_context_) |
main_request_context_->AssertNoURLRequests(); |
- |
- current_context = 0; |
- for (URLRequestContextMap::iterator it = app_request_context_map_.begin(); |
- it != app_request_context_map_.end(); ++it) { |
- if (current_context < kMaxCachedContexts) { |
- CHECK_EQ(app_context_cache[current_context], it->second); |
- memcpy(&tmp_vtable, static_cast<void*>(it->second), sizeof(void*)); |
- CHECK_EQ(app_context_vtable_cache[current_context], tmp_vtable); |
- } |
- it->second->AssertNoURLRequests(); |
- delete it->second; |
- current_context++; |
- } |
} |
// static |
@@ -254,21 +192,6 @@ net::URLRequestContext* ChromeBrowserStateIOData::GetMainRequestContext() |
return main_request_context_.get(); |
} |
-net::URLRequestContext* ChromeBrowserStateIOData::GetIsolatedAppRequestContext( |
- net::URLRequestContext* main_context, |
- const base::FilePath& partition_path) const { |
- DCHECK(initialized_); |
- net::URLRequestContext* context = nullptr; |
- if (ContainsKey(app_request_context_map_, partition_path)) { |
- context = app_request_context_map_[partition_path]; |
- } else { |
- context = AcquireIsolatedAppRequestContext(main_context); |
- app_request_context_map_[partition_path] = context; |
- } |
- DCHECK(context); |
- return context; |
-} |
- |
content_settings::CookieSettings* ChromeBrowserStateIOData::GetCookieSettings() |
const { |
DCHECK(initialized_); |