Ensure that isolated apps use the right cookies for media requests.

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2012 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/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 207 matching lines @@
 #endif
 
   initialized_on_UI_thread_ = true;
 
   // We need to make sure that content initializes its own data structures that
   // are associated with each ResourceContext because we might post this
   // object to the IO thread after this function.
   BrowserContext::EnsureResourceContextInitialized(profile);
 }
 
+ProfileIOData::MediaRequestContext::MediaRequestContext(
+    chrome_browser_net::CacheStats* cache_stats)
+    : ChromeURLRequestContext(ChromeURLRequestContext::CONTEXT_TYPE_MEDIA,
+                              cache_stats) {
+}
+
+void ProfileIOData::MediaRequestContext::SetHttpTransactionFactory(
+    net::HttpTransactionFactory* http_factory) {
+  http_factory_.reset(http_factory);
+  set_http_transaction_factory(http_factory);
+}
+
+ProfileIOData::MediaRequestContext::~MediaRequestContext() {}
+
 ProfileIOData::AppRequestContext::AppRequestContext(
     chrome_browser_net::CacheStats* cache_stats)
     : ChromeURLRequestContext(ChromeURLRequestContext::CONTEXT_TYPE_APP,
                               cache_stats) {
 }
 
 void ProfileIOData::AppRequestContext::SetCookieStore(
     net::CookieStore* cookie_store) {
   cookie_store_ = cookie_store;
   set_cookie_store(cookie_store);
@@ skipping 27 matching lines @@
 }
 
 ProfileIOData::~ProfileIOData() {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO))
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (main_request_context_.get())
     main_request_context_->AssertNoURLRequests();
   if (extensions_request_context_.get())
     extensions_request_context_->AssertNoURLRequests();
-  for (AppRequestContextMap::iterator it = app_request_context_map_.begin();
+  for (URLRequestContextMap::iterator it = app_request_context_map_.begin();
        it != app_request_context_map_.end(); ++it) {
     it->second->AssertNoURLRequests();
     delete it->second;
   }
+  for (URLRequestContextMap::iterator it =
+           isolated_media_request_context_map_.begin();
+       it != isolated_media_request_context_map_.end(); ++it) {
+    it->second->AssertNoURLRequests();
+    delete it->second;
+  }
 }
 
 // static
 ProfileIOData* ProfileIOData::FromResourceContext(
     content::ResourceContext* rc) {
   return (static_cast<ResourceContext*>(rc))->io_data_;
 }
 
 // static
 bool ProfileIOData::IsHandledProtocol(const std::string& scheme) {
@@ skipping 66 matching lines @@
   if (ContainsKey(app_request_context_map_, app_id)) {
     context = app_request_context_map_[app_id];
   } else {
     context = AcquireIsolatedAppRequestContext(main_context, app_id);
     app_request_context_map_[app_id] = context;
   }
   DCHECK(context);
   return context;
 }
 
+ChromeURLRequestContext*
+ProfileIOData::GetIsolatedMediaRequestContext(
+    ChromeURLRequestContext* main_context,
+    const std::string& app_id) const {
+  LazyInitialize();
+  ChromeURLRequestContext* context;
+  if (ContainsKey(isolated_media_request_context_map_, app_id)) {
+    context = isolated_media_request_context_map_[app_id];
+  } else {
+    // Get the app context as the starting point for the media context,
+    // so that it uses the app's cookie store.
+    ChromeURLRequestContext* app_context = GetIsolatedAppRequestContext(
+        main_context, app_id);
+    context = AcquireIsolatedMediaRequestContext(app_context, app_id);
+    isolated_media_request_context_map_[app_id] = context;
+  }
+  DCHECK(context);
+  return context;
+}
+
 ExtensionInfoMap* ProfileIOData::GetExtensionInfoMap() const {
   DCHECK(extension_info_map_) << "ExtensionSystem not initialized";
   return extension_info_map_;
 }
 
 CookieSettings* ProfileIOData::GetCookieSettings() const {
   return cookie_settings_;
 }
 
 #if defined(ENABLE_NOTIFICATIONS)
@@ skipping 233 matching lines @@
 }
 
 void ProfileIOData::set_server_bound_cert_service(
     net::ServerBoundCertService* server_bound_cert_service) const {
   server_bound_cert_service_.reset(server_bound_cert_service);
 }
 
 void ProfileIOData::DestroyResourceContext() {
   resource_context_.reset();
 }