Remove isolated app code from iOS's chrome_browser_state_io_data.

ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc

 // Copyright 2015 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 "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 113 matching lines @@
     sync_disabled_.Init(sync_driver::prefs::kSyncManaged, pref_service);
     sync_disabled_.MoveToThread(io_task_runner);
 
     signin_allowed_.Init(prefs::kSigninAllowed, pref_service);
     signin_allowed_.MoveToThread(io_task_runner);
   }
 
   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) {}
 
 ChromeBrowserStateIOData::ProfileParams::~ProfileParams() {}
 
 ChromeBrowserStateIOData::ChromeBrowserStateIOData(
     ios::ChromeBrowserStateType browser_state_type)
     : initialized_(false),
       initialized_on_UI_thread_(false),
       browser_state_type_(browser_state_type) {
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
 }
 
 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(&current_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_)
     transport_security_state_->SetReportSender(nullptr);
   certificate_report_sender_.reset();
 
   // TODO(ajwong): These AssertNoURLRequests() calls are unnecessary since they
   // 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
 bool ChromeBrowserStateIOData::IsHandledProtocol(const std::string& scheme) {
   DCHECK_EQ(scheme, base::ToLowerASCII(scheme));
   static const char* const kProtocolList[] = {
       url::kFileScheme, kChromeUIScheme, url::kDataScheme, url::kAboutScheme,
   };
   for (size_t i = 0; i < arraysize(kProtocolList); ++i) {
     if (scheme == kProtocolList[i])
@@ skipping 14 matching lines @@
   }
   protocol_handlers->clear();
 }
 
 net::URLRequestContext* ChromeBrowserStateIOData::GetMainRequestContext()
     const {
   DCHECK(initialized_);
   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_);
   return cookie_settings_.get();
 }
 
 HostContentSettingsMap* ChromeBrowserStateIOData::GetHostContentSettingsMap()
     const {
   DCHECK(initialized_);
   return host_content_settings_map_.get();
@@ skipping 201 matching lines @@
   return scoped_ptr<net::HttpCache>(
       new net::HttpCache(session, std::move(main_backend), true));
 }
 
 scoped_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory(
     net::HttpNetworkSession* shared_session,
     scoped_ptr<net::HttpCache::BackendFactory> backend) const {
   return scoped_ptr<net::HttpCache>(
       new net::HttpCache(shared_session, std::move(backend), true));
 }