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

Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc	(revision 121250)
+++ chrome/browser/profiles/profile_impl.cc	(working copy)
@@ -409,7 +409,7 @@
 
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       PluginPrefs::GetForProfile(this),
-      &io_data_.GetResourceContextNoInit());
+      io_data_.GetResourceContextNoInit());
 
   // Creation has been finished.
   if (delegate_)
@@ -565,7 +565,7 @@
   pref_change_registrar_.RemoveAll();
 
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
-      &io_data_.GetResourceContextNoInit());
+      io_data_.GetResourceContextNoInit());
 
   if (io_data_.HasMainRequestContext() &&
       default_request_context_ == GetRequestContext()) {
@@ -842,7 +842,7 @@
   return io_data_.GetMediaRequestContextGetter();
 }
 
-const content::ResourceContext& ProfileImpl::GetResourceContext() {
+content::ResourceContext* ProfileImpl::GetResourceContext() {
   return io_data_.GetResourceContext();
 }
 
@@ -1245,7 +1245,7 @@
                  appcache_service_.get(),
                  IsOffTheRecord()
                      ? FilePath() : GetPath().Append(chrome::kAppCacheDirname),
-                 &io_data_.GetResourceContextNoInit(),
+                 io_data_.GetResourceContextNoInit(),
                  make_scoped_refptr(GetExtensionSpecialStoragePolicy())));
 }