Remove isolated app code from iOS's chrome_browser_state_io_data.

ios/chrome/browser/browser_state/chrome_browser_state_impl_io_data.mm

 // 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_impl_io_data.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 171 matching lines @@
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
   DCHECK(!io_data_->lazy_params_);
 
   LazyParams* lazy_params = new LazyParams();
 
   lazy_params->cookie_path = cookie_path;
   lazy_params->channel_id_path = channel_id_path;
   lazy_params->cache_path = cache_path;
   lazy_params->cache_max_size = cache_max_size;
   io_data_->lazy_params_.reset(lazy_params);
-
-  // Keep track of profile path and cache sizes separately so we can use them
-  // on demand when creating storage isolated URLRequestContextGetters.
   io_data_->profile_path_ = profile_path;
-  io_data_->app_cache_max_size_ = cache_max_size;
 
   io_data_->InitializeMetricsEnabledStateOnUIThread();
 
   // TODO(tbansal): Move this to IO thread once the data reduction proxy
   // params are unified into a single object.
   bool enable_quic_for_data_reduction_proxy =
       IOSChromeIOThread::ShouldEnableQuicForDataReductionProxy();
 
   io_data_->set_data_reduction_proxy_io_data(
       CreateIOSChromeDataReductionProxyIOData(
@@ skipping 25 matching lines @@
     IOSChromeIOThread* io_thread) const {
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
   LazyInitialize();
   DCHECK(!main_request_context_getter_.get());
   main_request_context_getter_ =
       IOSChromeURLRequestContextGetter::Create(io_data_, protocol_handlers);
 
   return main_request_context_getter_;
 }
 
-scoped_refptr<IOSChromeURLRequestContextGetter>
-ChromeBrowserStateImplIOData::Handle::CreateIsolatedAppRequestContextGetter(
-    const base::FilePath& partition_path) const {
-  DCHECK_CURRENTLY_ON(web::WebThread::UI);
-  // Check that the partition_path is not the same as the base profile path. We
-  // expect isolated partition, which will never go to the default profile path.
-  CHECK(partition_path != browser_state_->GetStatePath());
-  LazyInitialize();
-
-  // Keep a map of request context getters, one per requested storage partition.
-  IOSChromeURLRequestContextGetterMap::iterator iter =
-      app_request_context_getter_map_.find(partition_path);
-  if (iter != app_request_context_getter_map_.end())
-    return iter->second;
-
-  IOSChromeURLRequestContextGetter* context =
-      IOSChromeURLRequestContextGetter::CreateForIsolatedApp(
-          browser_state_->GetRequestContext(), io_data_, partition_path);
-  app_request_context_getter_map_[partition_path] = context;
-  return context;
-}
-
 ChromeBrowserStateIOData* ChromeBrowserStateImplIOData::Handle::io_data()
     const {
   LazyInitialize();
   return io_data_;
 }
 
 void ChromeBrowserStateImplIOData::Handle::ClearNetworkingHistorySince(
     base::Time time,
     const base::Closure& completion) {
   DCHECK_CURRENTLY_ON(web::WebThread::UI);
@@ skipping 25 matching lines @@
       web::WebThread::GetTaskRunnerForThread(web::WebThread::IO));
   io_data_->InitializeOnUIThread(browser_state_);
 }
 
 scoped_ptr<ChromeBrowserStateIOData::IOSChromeURLRequestContextGetterVector>
 ChromeBrowserStateImplIOData::Handle::GetAllContextGetters() {
   IOSChromeURLRequestContextGetterMap::iterator iter;
   scoped_ptr<IOSChromeURLRequestContextGetterVector> context_getters(
       new IOSChromeURLRequestContextGetterVector());
 
-  iter = app_request_context_getter_map_.begin();
-  for (; iter != app_request_context_getter_map_.end(); ++iter)
-    context_getters->push_back(iter->second);
-
   if (main_request_context_getter_.get())
     context_getters->push_back(main_request_context_getter_);
 
   return context_getters;
 }
 
 ChromeBrowserStateImplIOData::LazyParams::LazyParams() : cache_max_size(0) {}
 
 ChromeBrowserStateImplIOData::LazyParams::~LazyParams() {}
 
 ChromeBrowserStateImplIOData::ChromeBrowserStateImplIOData()
     : ChromeBrowserStateIOData(
           ios::ChromeBrowserStateType::REGULAR_BROWSER_STATE),
-      http_server_properties_manager_(nullptr),
-      app_cache_max_size_(0) {}
+      http_server_properties_manager_(nullptr) {}
 
 ChromeBrowserStateImplIOData::~ChromeBrowserStateImplIOData() {}
 
 void ChromeBrowserStateImplIOData::InitializeInternal(
     scoped_ptr<IOSChromeNetworkDelegate> chrome_network_delegate,
     ProfileParams* profile_params,
     ProtocolHandlerMap* protocol_handlers) const {
   // Set up a persistent store for use by the network stack on the IO thread.
   base::FilePath network_json_store_filepath(
       profile_path_.Append(kIOSChromeNetworkPersistentStateFilename));
@@ skipping 104 matching lines @@
   // Setup SDCH for this profile.
   sdch_manager_.reset(new net::SdchManager);
   sdch_policy_.reset(new net::SdchOwner(sdch_manager_.get(), main_context));
   main_context->set_sdch_manager(sdch_manager_.get());
   sdch_policy_->EnablePersistentStorage(
       make_scoped_ptr(new SdchOwnerPrefStorage(network_json_store_.get())));
 
   lazy_params_.reset();
 }
 
-net::URLRequestContext*
-ChromeBrowserStateImplIOData::InitializeAppRequestContext(
-    net::URLRequestContext* main_context) const {
-  // Copy most state from the main context.
-  AppRequestContext* context = new AppRequestContext();
-  context->CopyFrom(main_context);
-
-  // Use a separate HTTP disk cache for isolated apps.
-  scoped_ptr<net::HttpCache::BackendFactory> app_backend =
-      net::HttpCache::DefaultBackend::InMemory(0);
-  scoped_ptr<net::HttpCache> app_http_cache =
-      CreateHttpFactory(http_network_session_.get(), std::move(app_backend));
-
-  cookie_util::CookieStoreConfig ios_cookie_config(
-      base::FilePath(),
-      cookie_util::CookieStoreConfig::EPHEMERAL_SESSION_COOKIES,
-      cookie_util::CookieStoreConfig::COOKIE_STORE_IOS, nullptr);
-  scoped_refptr<net::CookieStore> cookie_store =
-      cookie_util::CreateCookieStore(ios_cookie_config);
-
-  // Transfer ownership of the cookies and cache to AppRequestContext.
-  context->SetCookieStore(cookie_store.get());
-  context->SetHttpTransactionFactory(std::move(app_http_cache));
-
-  scoped_ptr<net::URLRequestJobFactoryImpl> job_factory(
-      new net::URLRequestJobFactoryImpl());
-  // The data reduction proxy interceptor should be as close to the network as
-  // possible.
-  URLRequestInterceptorScopedVector request_interceptors;
-  request_interceptors.insert(
-      request_interceptors.begin(),
-      data_reduction_proxy_io_data()->CreateInterceptor().release());
-  scoped_ptr<net::URLRequestJobFactory> top_job_factory(SetUpJobFactoryDefaults(
-      std::move(job_factory), std::move(request_interceptors),
-      main_context->network_delegate()));
-  context->SetJobFactory(std::move(top_job_factory));
-
-  return context;
-}
-
-net::URLRequestContext*
-ChromeBrowserStateImplIOData::AcquireIsolatedAppRequestContext(
-    net::URLRequestContext* main_context) const {
-  // We create per-app contexts on demand, unlike the others above.
-  net::URLRequestContext* app_request_context =
-      InitializeAppRequestContext(main_context);
-  DCHECK(app_request_context);
-  return app_request_context;
-}
-
 void ChromeBrowserStateImplIOData::ClearNetworkingHistorySinceOnIOThread(
     base::Time time,
     const base::Closure& completion) {
   DCHECK_CURRENTLY_ON(web::WebThread::IO);
   DCHECK(initialized());
 
   DCHECK(transport_security_state());
   // Completes synchronously.
   transport_security_state()->DeleteAllDynamicDataSince(time);
   DCHECK(http_server_properties_manager_);
   http_server_properties_manager_->Clear(completion);
 }