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

chrome/browser/profiles/profile_impl.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_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 83 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/browser/speech/speech_input_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #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)
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/password_manager/password_store_win.h"
 #include "chrome/installer/util/install_util.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/keychain_mac.h"
 #include "chrome/browser/mock_keychain_mac.h"
 #include "chrome/browser/password_manager/password_store_mac.h"
@@ skipping 53 matching lines @@
 FilePath GetCachePath(const FilePath& base) {
   return base.Append(chrome::kCacheDirname);
 }
 
 FilePath GetMediaCachePath(const FilePath& base) {
   return base.Append(chrome::kMediaCacheDirname);
 }
 
 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
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   if (!file_util::PathExists(path)) {
     // TODO(tc): http://b/1094718 Bad things happen if we can't write to the
     // profile directory.  We should eventually be able to run in this
     // situation.
@@ skipping 351 matching lines @@
       content::NotificationService::NoDetails());
   // Save the session state if we're going to restore the session during the
   // next startup.
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(this);
   if (pref.type == SessionStartupPref::LAST) {
     SaveSessionState();
   } else if (clear_local_state_on_exit_) {
     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);
   }
 
   StopCreateSessionServiceTimer();
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
@@ skipping 866 matching lines @@
 void ProfileImpl::SaveSessionState() {
   if (!session_restore_enabled_)
     return;
   BrowserContext::GetWebKitContext(this)->SaveSessionState();
   BrowserContext::GetDatabaseTracker(this)->SaveSessionState();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SaveSessionStateOnIOThread,
                  make_scoped_refptr(GetRequestContext()),
-                 make_scoped_refptr(BrowserContext::GetAppCacheService(this))));
+                 BrowserContext::GetAppCacheService(this)));
 }
 
 void ProfileImpl::UpdateProfileUserNameCache() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(GetPath());
   if (index != std::string::npos) {
     std::string user_name =
         GetPrefs()->GetString(prefs::kGoogleServicesUsername);
     cache.SetUserNameOfProfileAtIndex(index, UTF8ToUTF16(user_name));
@@ skipping 31 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }