Make safe browsing work in a multi-profile environment.

chrome/browser/ui/tab_contents/tab_contents_wrapper.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/ui/tab_contents/tab_contents_wrapper.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_manager.h"
@@ skipping 56 matching lines @@
 
 static base::LazyInstance<PropertyAccessor<TabContentsWrapper*> >
     g_tab_contents_wrapper_property_accessor(base::LINKER_INITIALIZED);
 
 // The list of prefs we want to observe.
 const char* kPrefsToObserve[] = {
   prefs::kAlternateErrorPagesEnabled,
   prefs::kDefaultCharset,
   prefs::kDefaultZoomLevel,
   prefs::kEnableReferrers,
+  prefs::kSafeBrowsingEnabled,
   prefs::kWebKitAllowDisplayingInsecureContent,
   prefs::kWebKitAllowRunningInsecureContent,
   prefs::kWebKitDefaultFixedFontSize,
   prefs::kWebKitDefaultFontSize,
   prefs::kWebKitFixedFontFamily,
   prefs::kWebKitJavaEnabled,
   prefs::kWebKitJavascriptEnabled,
   prefs::kWebKitLoadsImagesAutomatically,
   prefs::kWebKitMinimumFontSize,
   prefs::kWebKitMinimumLogicalFontSize,
@@ skipping 33 matching lines @@
   download_tab_helper_.reset(new DownloadTabHelper(this));
   extension_tab_helper_.reset(new ExtensionTabHelper(this));
   favicon_tab_helper_.reset(new FaviconTabHelper(contents));
   find_tab_helper_.reset(new FindTabHelper(contents));
   history_tab_helper_.reset(new HistoryTabHelper(contents));
   restore_tab_helper_.reset(new RestoreTabHelper(this));
   password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));
   password_manager_.reset(
       new PasswordManager(contents, password_manager_delegate_.get()));
   safebrowsing_detection_host_.reset(
       safe_browsing::ClientSideDetectionHost::Create(contents));

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

Oops, I think I gave some odd advice since looking now it's a bit strange we
always create a CSDH to start with and it checks the pref itself, then we
observe the pref to create/delete the CSDH.

I guess we should also move the SB pref check from the CSDH constructor to here
to keep things consistent (and check
g_browser_process->safe_browsing_detection_service() too)

If we do that we could remove the comments in CSDH about csd_service and
sb_service possibly being null and remove those if statements or change them to
DCHECKs

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

Strangeness fixed.

   search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));
   ssl_helper_.reset(new TabContentsSSLHelper(this));
   content_settings_.reset(new TabSpecificContentSettings(contents));
   translate_tab_helper_.reset(new TranslateTabHelper(contents));
   print_view_manager_.reset(new printing::PrintViewManager(this));
 
   // Create the per-tab observers.
   external_protocol_observer_.reset(new ExternalProtocolObserver(contents));
   file_select_observer_.reset(new FileSelectObserver(contents));
   plugin_observer_.reset(new PluginObserver(this));
@@ skipping 307 matching lines @@
       if (*pref_name_in == prefs::kAlternateErrorPagesEnabled) {
         UpdateAlternateErrorPageURL(render_view_host());
       } else if ((*pref_name_in == prefs::kDefaultCharset) ||
                  StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) {
         UpdateWebPreferences();
       } else if (*pref_name_in == prefs::kDefaultZoomLevel) {
         Send(new ViewMsg_SetZoomLevel(
             routing_id(), tab_contents()->GetZoomLevel()));
       } else if (*pref_name_in == prefs::kEnableReferrers) {
         UpdateRendererPreferences();
+      } else if (*pref_name_in == prefs::kSafeBrowsingEnabled) {
+        UpdateSafebrowsingDetectionHost();

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

Just thought of one thing.. this is fine with this CL.  But wanted to mention
while I'm thinking of it that with 82905 and/or 88661 we would have to be sure
that when enabling safebrowsing the csd service and sb service exist before any
tabcontents pref observers create their ClientSideDetectionHost.  Just something
to keep in mind for later.

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

Good point, yes -- made a note of this in 88661.

       } else {
         NOTREACHED() << "unexpected pref change notification" << *pref_name_in;
       }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
@@ skipping 153 matching lines @@
   RenderViewHostDelegate* rvhd = tab_contents();
   Send(new ViewMsg_UpdateWebPreferences(routing_id(), rvhd->GetWebkitPrefs()));
 }
 
 void TabContentsWrapper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       tab_contents()->GetMutableRendererPrefs(), profile());
   render_view_host()->SyncRendererPrefs();
 }
 
+void TabContentsWrapper::UpdateSafebrowsingDetectionHost() {
+  PrefService* prefs = profile()->GetPrefs();
+  bool safe_browsing = prefs->GetBoolean(prefs::kSafeBrowsingEnabled);

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

Should also check g_browser_process->safe_browsing_detection_service() isn't
NULL (related to my comment in chrome_render_view_observer.cc).  

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

Done.

+  if (safe_browsing) {
+    if (!safebrowsing_detection_host_.get()) {
+      safebrowsing_detection_host_.reset(
+          safe_browsing::ClientSideDetectionHost::Create(tab_contents()));
+    }
+  } else {
+    safebrowsing_detection_host_.reset();
+  }
+  render_view_host()->Send(
+      new ViewMsg_SetClientSidePhishingDetection(routing_id(), safe_browsing));
+}
+
 void TabContentsWrapper::RemoveInfoBarInternal(InfoBarDelegate* delegate,
                                                bool animate) {
   if (!infobars_enabled_) {
     DCHECK(infobars_.empty());
     return;
   }
 
   size_t i;
   for (i = 0; i < infobars_.size(); ++i) {
     if (GetInfoBarDelegateAt(i) == delegate)
@@ skipping 13 matching lines @@
   if (infobars_.empty()) {
     registrar_.Remove(this, NotificationType::NAV_ENTRY_COMMITTED,
         Source<NavigationController>(&tab_contents_->controller()));
   }
 }
 
 void TabContentsWrapper::RemoveAllInfoBars(bool animate) {
   while (!infobars_.empty())
     RemoveInfoBarInternal(GetInfoBarDelegateAt(infobar_count() - 1), animate);
 }