Make content::ResourceContext be a real interface like the rest of the Content API (i.e. don't ha...

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 391 matching lines @@
 
   io_data_.Init(cookie_path, origin_bound_cert_path, cache_path,
                 cache_max_size, media_cache_path, media_cache_max_size,
                 extensions_cookie_path, app_path, predictor_,
                 g_browser_process->local_state(),
                 g_browser_process->io_thread(),
                 restore_old_session_cookies);
 
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       PluginPrefs::GetForProfile(this),
-      &io_data_.GetResourceContextNoInit());
+      io_data_.GetResourceContextNoInit());
 
   // Creation has been finished.
   if (delegate_)
     delegate_->OnProfileCreated(this, true);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CREATED,
       content::Source<Profile>(this),
       content::NotificationService::NoDetails());
 }
@@ skipping 135 matching lines @@
         base::Bind(&appcache::AppCacheService::set_clear_local_state_on_exit,
                    appcache_service_.get(), true));
   }
 
   StopCreateSessionServiceTimer();
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
-      &io_data_.GetResourceContextNoInit());
+      io_data_.GetResourceContextNoInit());
 
   if (io_data_.HasMainRequestContext() &&
       default_request_context_ == GetRequestContext()) {
     default_request_context_ = NULL;
   }
 
   // Destroy OTR profile and its profile services first.
   DestroyOffTheRecordProfile();
 
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
@@ skipping 256 matching lines @@
       return GetRequestContextForIsolatedApp(installed_app->id());
     }
   }
   return GetRequestContext();
 }
 
 net::URLRequestContextGetter* ProfileImpl::GetRequestContextForMedia() {
   return io_data_.GetMediaRequestContextGetter();
 }
 
-const content::ResourceContext& ProfileImpl::GetResourceContext() {
+content::ResourceContext* ProfileImpl::GetResourceContext() {
   return io_data_.GetResourceContext();
 }
 
 FaviconService* ProfileImpl::GetFaviconService(ServiceAccessType sat) {
   if (!favicon_service_created_) {
     favicon_service_created_ = true;
     favicon_service_.reset(new FaviconService(this));
   }
   return favicon_service_.get();
 }
@@ skipping 382 matching lines @@
         clear_local_state_on_exit_, quota_manager_->proxy(),
         BrowserThread::GetMessageLoopProxyForThread(
             BrowserThread::WEBKIT_DEPRECATED));
   appcache_service_ = new ChromeAppCacheService(quota_manager_->proxy());
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&ChromeAppCacheService::InitializeOnIOThread,
                  appcache_service_.get(),
                  IsOffTheRecord()
                      ? FilePath() : GetPath().Append(chrome::kAppCacheDirname),
-                 &io_data_.GetResourceContextNoInit(),
+                 io_data_.GetResourceContextNoInit(),
                  make_scoped_refptr(GetExtensionSpecialStoragePolicy())));
 }
 
 WebKitContext* ProfileImpl::GetWebKitContext() {
   CreateQuotaManagerAndClients();
   return webkit_context_.get();
 }
 
 void ProfileImpl::MarkAsCleanShutdown() {
   if (prefs_.get()) {
@@ skipping 330 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);
 }