Remove getters for HTML5 related objects from the ResourceContext interface. Half of them weren't u…

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc	(revision 122771)
+++ chrome/browser/profiles/profile_impl.cc	(working copy)
@@ -101,6 +101,7 @@
 #include "grit/locale_settings.h"
 #include "net/base/transport_security_state.h"
 #include "net/http/http_server_properties.h"
+#include "webkit/appcache/appcache_service.h"
 #include "webkit/database/database_tracker.h"
 
 #if defined(OS_WIN)
@@ -174,12 +175,11 @@
 
 void SaveSessionStateOnIOThread(
     net::URLRequestContextGetter* url_request_context_getter,
-    ChromeAppCacheService* appcache_service) {
+    appcache::AppCacheService* appcache_service) {

[Jói, 2012/02/20 23:13:49]

perhaps DCHECK on this not being NULL since you removed the conditional below

[jam, 2012/02/21 01:20:13]

I'm personally not a fan of DCHECKing that a pointer isn't null before it's
used, since if it's NULL the crash below will be just as good of a signal :)

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   url_request_context_getter->GetURLRequestContext()->cookie_store()->
       GetCookieMonster()->SaveSessionCookies();
-  if (appcache_service)
-    appcache_service->set_save_session_state(true);
+  appcache_service->set_save_session_state(true);
 }
 
 }  // namespace
@@ -551,7 +551,7 @@
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&appcache::AppCacheService::set_clear_local_state_on_exit,
-            BrowserContext::GetAppCacheService(this), true));
+            base::Unretained(BrowserContext::GetAppCacheService(this)), true));
     BrowserContext::GetWebKitContext(this)->set_clear_local_state_on_exit(true);
     BrowserContext::GetDatabaseTracker(this)->SetClearLocalStateOnExit(true);
   }
@@ -1438,7 +1438,7 @@
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SaveSessionStateOnIOThread,
                  make_scoped_refptr(GetRequestContext()),
-                 make_scoped_refptr(BrowserContext::GetAppCacheService(this))));
+                 BrowserContext::GetAppCacheService(this)));
 }
 
 void ProfileImpl::UpdateProfileUserNameCache() {