Remove silly uses of ResourceContext that unnecessarily violate the Law of Demeter.

content/browser/browser_context.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/public/browser/browser_context.h"
 
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "webkit/database/database_tracker.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/in_process_webkit/indexed_db_context_impl.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 #include "content/public/browser/resource_context.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/browser/storage_partition_impl_map.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/base/server_bound_cert_service.h"
 #include "net/base/server_bound_cert_store.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
 
 using base::UserDataAdapter;
 
 // Key names on BrowserContext.
 static const char* kDownloadManagerKeyName = "download_manager";
 static const char* kStorageParitionMapKeyName = "content_storage_partition_map";
 
 namespace content {
 
 namespace {
@@ skipping 12 matching lines @@
   return partition_map->Get(partition_id);
 }
 
 // Run |callback| on each DOMStorageContextImpl in |browser_context|.
 void PurgeDOMStorageContextInPartition(const std::string& id,
                                        StoragePartition* storage_partition) {
   static_cast<StoragePartitionImpl*>(storage_partition)->
       GetDOMStorageContext()->PurgeMemory();
 }
 
-void SaveSessionStateOnIOThread(ResourceContext* resource_context) {
-  resource_context->GetRequestContext()->cookie_store()->GetCookieMonster()->
+void SaveSessionStateOnIOThread(
+    const scoped_refptr<net::URLRequestContextGetter>& context_getter,
+    appcache::AppCacheService* appcache_service) {
+  net::URLRequestContext* context = context_getter->GetURLRequestContext();
+  context->cookie_store()->GetCookieMonster()->
       SetForceKeepSessionState();
-  resource_context->GetRequestContext()->server_bound_cert_service()->
-      GetCertStore()->SetForceKeepSessionState();
-  ResourceContext::GetAppCacheService(resource_context)->
-      set_force_keep_session_state();
+  context->server_bound_cert_service()->GetCertStore()->
+      SetForceKeepSessionState();
+  appcache_service->set_force_keep_session_state();
 }
 
 void SaveSessionStateOnWebkitThread(
     scoped_refptr<IndexedDBContextImpl> indexed_db_context) {
   indexed_db_context->SetForceKeepSessionState();
 }
 
-void PurgeMemoryOnIOThread(ResourceContext* resource_context) {
-  ResourceContext::GetAppCacheService(resource_context)->PurgeMemory();
+void PurgeMemoryOnIOThread(appcache::AppCacheService* appcache_service) {
+  appcache_service->PurgeMemory();
 }
 
 }  // namespace
 
 DownloadManager* BrowserContext::GetDownloadManager(
     BrowserContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (!context->GetUserData(kDownloadManagerKeyName)) {
     ResourceDispatcherHostImpl* rdh = ResourceDispatcherHostImpl::Get();
     DCHECK(rdh);
@@ skipping 88 matching lines @@
   // See http://crbug.com/115678.
   GetDefaultStoragePartition(context);
 }
 
 void BrowserContext::SaveSessionState(BrowserContext* browser_context) {
   GetDatabaseTracker(browser_context)->SetForceKeepSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&SaveSessionStateOnIOThread,
-                   browser_context->GetResourceContext()));
+        base::Bind(
+            &SaveSessionStateOnIOThread,
+            make_scoped_refptr(browser_context->GetRequestContext()),
+            BrowserContext::GetDefaultStoragePartition(browser_context)->
+                GetAppCacheService()));
   }
 
   DOMStorageContextImpl* dom_storage_context_impl =
       static_cast<DOMStorageContextImpl*>(
           GetDefaultStoragePartition(browser_context)->GetDOMStorageContext());
   dom_storage_context_impl->SetForceKeepSessionState();
 
   if (BrowserThread::IsMessageLoopValid(BrowserThread::WEBKIT_DEPRECATED)) {
     IndexedDBContextImpl* indexed_db = static_cast<IndexedDBContextImpl*>(
         GetIndexedDBContext(browser_context));
     BrowserThread::PostTask(
         BrowserThread::WEBKIT_DEPRECATED, FROM_HERE,
         base::Bind(&SaveSessionStateOnWebkitThread,
                    make_scoped_refptr(indexed_db)));
   }
 }
 
 void BrowserContext::PurgeMemory(BrowserContext* browser_context) {
   if (BrowserThread::IsMessageLoopValid(BrowserThread::IO)) {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
-        base::Bind(&PurgeMemoryOnIOThread,
-                   browser_context->GetResourceContext()));
+        base::Bind(
+            &PurgeMemoryOnIOThread,
+            BrowserContext::GetDefaultStoragePartition(browser_context)->
+                GetAppCacheService()));
   }
 
   ForEachStoragePartition(browser_context,
                           base::Bind(&PurgeDOMStorageContextInPartition));
 }
 
 BrowserContext::~BrowserContext() {
   if (GetUserData(kDownloadManagerKeyName))
     GetDownloadManager(this)->Shutdown();
 }
 
 }  // namespace content