Make safe browsing work in a multi-profile environment.

chrome/renderer/chrome_render_view_observer.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/renderer/chrome_render_view_observer.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 140 matching lines @@
     case WebIconURL::TypeInvalid:
       return FaviconURL::INVALID_ICON;
   }
   return FaviconURL::INVALID_ICON;
 }
 
 ChromeRenderViewObserver::ChromeRenderViewObserver(
     RenderView* render_view,
     ContentSettingsObserver* content_settings,
     ExtensionDispatcher* extension_dispatcher,
-    TranslateHelper* translate_helper,
-    safe_browsing::PhishingClassifierDelegate* phishing_classifier)
+    TranslateHelper* translate_helper)
     : RenderViewObserver(render_view),
       content_settings_(content_settings),
       extension_dispatcher_(extension_dispatcher),
       translate_helper_(translate_helper),
-      phishing_classifier_(phishing_classifier),
+      phishing_classifier_(NULL),
       last_indexed_page_id_(-1),
       allow_displaying_insecure_content_(false),
       allow_running_insecure_content_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(page_info_method_factory_(this)) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kDomAutomationController)) {
     int old_bindings = render_view->enabled_bindings();
     render_view->set_enabled_bindings(
         old_bindings |= BindingsPolicy::DOM_AUTOMATION);
   }
   render_view->webview()->setPermissionClient(this);
+  OnSetClientSidePhishingDetection(true);
 }
 
 ChromeRenderViewObserver::~ChromeRenderViewObserver() {
 }
 
 bool ChromeRenderViewObserver::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewObserver, message)
     IPC_MESSAGE_HANDLER(ViewMsg_CaptureSnapshot, OnCaptureSnapshot)
     IPC_MESSAGE_HANDLER(ViewMsg_HandleMessageFromExternalHost,
                         OnHandleMessageFromExternalHost)
     IPC_MESSAGE_HANDLER(ViewMsg_JavaScriptStressTestControl,
                         OnJavaScriptStressTestControl)
     IPC_MESSAGE_HANDLER(ViewMsg_GetAllSavableResourceLinksForCurrentPage,
                         OnGetAllSavableResourceLinksForCurrentPage)
     IPC_MESSAGE_HANDLER(
         ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks,
         OnGetSerializedHtmlDataForCurrentPageWithLocalLinks)
     IPC_MESSAGE_HANDLER(IconMsg_DownloadFavicon, OnDownloadFavicon)
     IPC_MESSAGE_HANDLER(ViewMsg_EnableViewSourceMode, OnEnableViewSourceMode)
     IPC_MESSAGE_HANDLER(ViewMsg_SetAllowDisplayingInsecureContent,
                         OnSetAllowDisplayingInsecureContent)
     IPC_MESSAGE_HANDLER(ViewMsg_SetAllowRunningInsecureContent,
                         OnSetAllowRunningInsecureContent)
+    IPC_MESSAGE_HANDLER(ViewMsg_SetClientSidePhishingDetection,
+                        OnSetClientSidePhishingDetection)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   // Filter only.
   IPC_BEGIN_MESSAGE_MAP(ChromeRenderViewObserver, message)
     IPC_MESSAGE_HANDLER(ViewMsg_Navigate, OnNavigate)
     IPC_MESSAGE_HANDLER(ViewMsg_SetIsPrerendering, OnSetIsPrerendering);
   IPC_END_MESSAGE_MAP()
 
   return handled;
@@ skipping 119 matching lines @@
   WebFrame* main_frame = render_view()->webview()->mainFrame();
   if (main_frame)
     main_frame->reload();
 }
 
 void ChromeRenderViewObserver::OnSetAllowRunningInsecureContent(bool allow) {
   allow_running_insecure_content_ = allow;
   OnSetAllowDisplayingInsecureContent(allow);
 }
 
+void ChromeRenderViewObserver::OnSetClientSidePhishingDetection(
+    bool enable_phishing_detection) {
+#ifndef OS_CHROMEOS
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableClientSidePhishingDetection)) {

[mattm, 2011/07/08 22:15:24]

Hm, since we use the switch to set the initial state of the renderer, we should
only check it in the constructor, not in the ipc handler, otherwise you could
never enable it in a renderer that started with it disabled.

[Miranda Callahan, 2011/07/12 16:24:08]

Done.

+    phishing_classifier_ = enable_phishing_detection ?
+        safe_browsing::PhishingClassifierDelegate::Create(
+            render_view(), NULL) :
+        NULL;
+  }
+#endif
+}
+
 void ChromeRenderViewObserver::didSerializeDataForFrame(
     const WebURL& frame_url,
     const WebCString& data,
     WebPageSerializerClient::PageSerializationStatus status) {
   Send(new ViewHostMsg_SendSerializedHtmlData(
     routing_id(),
     frame_url,
     data.data(),
     static_cast<int32>(status)));
 }
@@ skipping 488 matching lines @@
   if (net::DataURL::Parse(url, &mime_type, &char_set, &data) && !data.empty()) {
     // Decode the favicon using WebKit's image decoder.
     webkit_glue::ImageDecoder decoder(gfx::Size(kFaviconSize, kFaviconSize));
     const unsigned char* src_data =
         reinterpret_cast<const unsigned char*>(&data[0]);
 
     return decoder.Decode(src_data, data.size());
   }
   return SkBitmap();
 }