Make safe browsing work in a multi-profile environment.

chrome/renderer/chrome_content_renderer_client.cc

Index: chrome/renderer/chrome_content_renderer_client.cc
===================================================================
--- chrome/renderer/chrome_content_renderer_client.cc	(revision 92179)
+++ chrome/renderer/chrome_content_renderer_client.cc	(working copy)
@@ -145,9 +145,7 @@
   net_predictor_.reset(new RendererNetPredictor());
   spellcheck_.reset(new SpellCheck());
   visited_link_slave_.reset(new VisitedLinkSlave());
-#if defined(ENABLE_SAFE_BROWSING)

[mattm, 2011/07/12 21:41:58]

Looks like some merges got squashed

[Miranda Callahan, 2011/07/13 18:13:51]

Wow, did they ever. :-/  Fixed.

   phishing_classifier_.reset(safe_browsing::PhishingClassifierFilter::Create());
-#endif
 
   RenderThread* thread = RenderThread::current();
   thread->AddFilter(new DevToolsAgentFilter());
@@ -155,9 +153,7 @@
   thread->AddObserver(chrome_observer_.get());
   thread->AddObserver(extension_dispatcher_.get());
   thread->AddObserver(histogram_snapshots_.get());
-#if defined(ENABLE_SAFE_BROWSING)
   thread->AddObserver(phishing_classifier_.get());
-#endif
   thread->AddObserver(spellcheck_.get());
   thread->AddObserver(visited_link_slave_.get());
 
@@ -197,15 +193,6 @@
 }
 
 void ChromeContentRendererClient::RenderViewCreated(RenderView* render_view) {
-  safe_browsing::PhishingClassifierDelegate* phishing_classifier = NULL;
-#if defined(ENABLE_SAFE_BROWSING) && !defined(OS_CHROMEOS)
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableClientSidePhishingDetection)) {
-    phishing_classifier =
-        safe_browsing::PhishingClassifierDelegate::Create(render_view, NULL);
-  }
-#endif
-
   ContentSettingsObserver* content_settings =
       new ContentSettingsObserver(render_view);
   new DevToolsAgent(render_view);
@@ -215,9 +202,7 @@
   new PrintWebViewHelper(render_view);
   new SearchBox(render_view);
   new SpellCheckProvider(render_view, spellcheck_.get());
-#if defined(ENABLE_SAFE_BROWSING)
   safe_browsing::MalwareDOMDetails::Create(render_view);
-#endif
 
 #if defined(OS_MACOSX)
   new TextInputClientObserver(render_view);
@@ -236,8 +221,7 @@
 
   TranslateHelper* translate = new TranslateHelper(render_view, autofill_agent);
   new ChromeRenderViewObserver(
-      render_view, content_settings, extension_dispatcher_.get(),
-      translate, phishing_classifier);
+      render_view, content_settings, extension_dispatcher_.get(), translate);
 
   // Used only for testing/automation.
   if (CommandLine::ForCurrentProcess()->HasSwitch(