Revert 94332 - Removal of Profile from content part 2.

BUG=76788
TEST=no change visible

Review URL: http://codereview.chromium.org/7480028

TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/7492051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94335 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 8 deletions

diff --git a/chrome/browser/visitedlink/visitedlink_event_listener.cc b/chrome/browser/visitedlink/visitedlink_event_listener.cc
index 13461d4..cadfedb 100644
--- a/chrome/browser/visitedlink/visitedlink_event_listener.cc
+++ b/chrome/browser/visitedlink/visitedlink_event_listener.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -122,8 +122,7 @@ void VisitedLinkEventListener::NewTable(base::SharedMemory* table_memory) {
   for (Updaters::iterator i = updaters_.begin(); i != updaters_.end(); ++i) {
     // Make sure to not send to incognito renderers.
     RenderProcessHost* process = RenderProcessHost::FromID(i->first);
-    Profile* profile = Profile::FromBrowserContext(process->browser_context());
-    VisitedLinkMaster* master = profile->GetVisitedLinkMaster();
+    VisitedLinkMaster* master = process->profile()->GetVisitedLinkMaster();
     if (master && master->shared_memory() == table_memory)
       i->second->SendVisitedLinkTable(table_memory);
   }
@@ -170,9 +169,7 @@ void VisitedLinkEventListener::Observe(int type,
 
       // Initialize support for visited links. Send the renderer process its
       // initial set of visited links.
-      Profile* profile =
-          Profile::FromBrowserContext(process->browser_context());
-      VisitedLinkMaster* master = profile->GetVisitedLinkMaster();
+      VisitedLinkMaster* master = process->profile()->GetVisitedLinkMaster();
       if (!master)
         return;
 
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index 3af5113..86362a1 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -524,8 +524,7 @@ class VisitRelayingRenderProcessHost : public BrowserRenderProcessHost {
 
   virtual bool Send(IPC::Message* msg) {
     VisitCountingProfile* counting_profile =
-        static_cast<VisitCountingProfile*>(
-            Profile::FromBrowserContext(browser_context()));
+        static_cast<VisitCountingProfile*>(profile());
 
     if (msg->type() == ViewMsg_VisitedLink_Add::ID) {
       void* iter = NULL;