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

chrome/browser/profiles/off_the_record_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/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 95 matching lines @@
   // prevent a race.
 #if defined(OS_CHROMEOS)
   GetRequestContext();
 #endif  // defined(OS_CHROMEOS)
 
   // Make the chrome//extension-icon/ resource available.
   ExtensionIconSource* icon_source = new ExtensionIconSource(profile_);
   GetChromeURLDataManager()->AddDataSource(icon_source);
 
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
-      PluginPrefs::GetForProfile(this), &io_data_.GetResourceContextNoInit());
+      PluginPrefs::GetForProfile(this), io_data_.GetResourceContextNoInit());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NotifyOTRProfileCreatedOnIOThread, profile_, this));
 }
 
 OffTheRecordProfileImpl::~OffTheRecordProfileImpl() {
   content::NotificationService::current()->Notify(
     chrome::NOTIFICATION_PROFILE_DESTROYED, content::Source<Profile>(this),
     content::NotificationService::NoDetails());
 
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
-    &io_data_.GetResourceContextNoInit());
+    io_data_.GetResourceContextNoInit());
 
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&NotifyOTRProfileDestroyedOnIOThread, profile_, this));
 
   // Clean up all DB files/directories
   if (db_tracker_) {
     BrowserThread::PostTask(
@@ skipping 221 matching lines @@
     OffTheRecordProfileImpl::GetRequestContextForExtensions() {
   return io_data_.GetExtensionsRequestContextGetter();
 }
 
 net::URLRequestContextGetter*
     OffTheRecordProfileImpl::GetRequestContextForIsolatedApp(
         const std::string& app_id) {
   return io_data_.GetIsolatedAppRequestContextGetter(app_id);
 }
 
-const content::ResourceContext&
-    OffTheRecordProfileImpl::GetResourceContext() {
+content::ResourceContext* OffTheRecordProfileImpl::GetResourceContext() {
   return io_data_.GetResourceContext();
 }
 
 net::SSLConfigService* OffTheRecordProfileImpl::GetSSLConfigService() {
   return profile_->GetSSLConfigService();
 }
 
 HostContentSettingsMap* OffTheRecordProfileImpl::GetHostContentSettingsMap() {
   // Retrieve the host content settings map of the parent profile in order to
   // ensure the preferences have been migrated.
@@ skipping 217 matching lines @@
       false, 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())));
 }
 
 #if defined(OS_CHROMEOS)
 // Special case of the OffTheRecordProfileImpl which is used while Guest
 // session in CrOS.
 class GuestSessionProfile : public OffTheRecordProfileImpl {
  public:
   explicit GuestSessionProfile(Profile* real_profile)
       : OffTheRecordProfileImpl(real_profile) {
@@ skipping 14 matching lines @@
   OffTheRecordProfileImpl* profile = NULL;
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     profile = new GuestSessionProfile(this);
 #endif
   if (!profile)
     profile = new OffTheRecordProfileImpl(this);
   profile->Init();
   return profile;
 }