AppCache and StoragePartition'ing

content/browser/appcache/chrome_appcache_service.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 "content/browser/appcache/chrome_appcache_service.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/resource_context.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "webkit/appcache/appcache_storage_impl.h"
 #include "webkit/quota/quota_manager.h"
 
 using content::BrowserThread;
 
 ChromeAppCacheService::ChromeAppCacheService(
     quota::QuotaManagerProxy* quota_manager_proxy)
     : AppCacheService(quota_manager_proxy),
       resource_context_(NULL) {
 }
 
 void ChromeAppCacheService::InitializeOnIOThread(
     const FilePath& cache_path,
     content::ResourceContext* resource_context,
+    net::URLRequestContextGetter* request_context_getter,
     scoped_refptr<quota::SpecialStoragePolicy> special_storage_policy) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   cache_path_ = cache_path;
   resource_context_ = resource_context;
-  set_request_context(resource_context->GetRequestContext());
+
+  // The |request_context_getter| can be NULL in some unit tests.
+  // TODO(awong): TestProfile is difficult to work with. The
+  // SafeBrowsing tests require that GetRequestContext return NULL
+  // so we can't depend on having a non-NULL value here. See crbug/149783.
+  if (request_context_getter)
+    set_request_context(request_context_getter->GetURLRequestContext());
 
   // Init our base class.
   Initialize(
       cache_path_,
       BrowserThread::GetMessageLoopProxyForThread(
           BrowserThread::FILE_USER_BLOCKING),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE));
   set_appcache_policy(this);
   set_special_storage_policy(special_storage_policy);
 }
@@ skipping 16 matching lines @@
 ChromeAppCacheService::~ChromeAppCacheService() {}
 
 void ChromeAppCacheService::DeleteOnCorrectThread() const {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO) &&
       !BrowserThread::CurrentlyOn(BrowserThread::IO)) {
     BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE, this);
     return;
   }
   delete this;
 }