Revert 94332 - Removal of Profile from content part 2.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2011 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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 1345 matching lines @@
   // extension.
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_LOADED,
       Source<Profile>(profile_),
       Details<const Extension>(extension));
 
   // Tell renderers about the new extension.
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     RenderProcessHost* host = i.GetCurrentValue();
-    Profile* host_profile =
-        Profile::FromBrowserContext(host->browser_context());
-    if (host_profile->GetOriginalProfile() == profile_->GetOriginalProfile()) {
+    if (host->profile()->GetOriginalProfile() ==
+        profile_->GetOriginalProfile()) {
       host->Send(
           new ExtensionMsg_Loaded(ExtensionMsg_Loaded_Params(
               extension, extension->GetActivePermissions())));
     }
   }
 
   // Tell a random-ass collection of other subsystems about the new extension.
   // TODO(aa): What should we do with all this goop? Can it move into the
   // relevant objects via EXTENSION_LOADED?
 
@@ skipping 75 matching lines @@
     const Extension* extension, UnloadedExtensionInfo::Reason reason) {
   UnloadedExtensionInfo details(extension, reason);
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       Source<Profile>(profile_),
       Details<UnloadedExtensionInfo>(&details));
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     RenderProcessHost* host = i.GetCurrentValue();
-    Profile* host_profile =
-        Profile::FromBrowserContext(host->browser_context());
-    if (host_profile->GetOriginalProfile() == profile_->GetOriginalProfile())
+    if (host->profile()->GetOriginalProfile() ==
+        profile_->GetOriginalProfile()) {
       host->Send(new ExtensionMsg_Unloaded(extension->id()));
+    }
   }
 
   profile_->UnregisterExtensionWithRequestContexts(extension->id(), reason);
   profile_->GetExtensionSpecialStoragePolicy()->
       RevokeRightsForExtension(extension);
 
   ExtensionWebUI::UnregisterChromeURLOverrides(
       profile_, extension->GetChromeURLOverrides());
 
 #if defined(OS_CHROMEOS)
@@ skipping 1083 matching lines @@
 
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }