Only send the client-side phishing model to a renderer if its profile has SafeBrowsing enabled.

chrome/browser/safe_browsing/client_side_detection_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/safe_browsing/client_side_detection_service.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/time.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stl_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "chrome/common/net/http_return.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/safe_browsing/client_model.pb.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/notification_service.h"
 #include "crypto/sha2.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
@@ skipping 52 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   scoped_ptr<ClientSideDetectionService> service(
       new ClientSideDetectionService(request_context_getter));
   if (!service->InitializePrivateNetworks()) {
     UMA_HISTOGRAM_COUNTS("SBClientPhishing.InitPrivateNetworksFailed", 1);
     return NULL;
   }
   return service.release();
 }
 
-void ClientSideDetectionService::SetEnabled(bool enabled) {
+void ClientSideDetectionService::SetEnabledAndRefreshState(bool enabled) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  SendModelToRenderers();  // always refresh the renderer state

[noelutz, 2011/10/18 00:33:42]

What's the thought behind sending the model if the state has not changed?

   if (enabled == enabled_)
     return;
   enabled_ = enabled;
   if (enabled_) {
     // Refresh the model when the service is enabled.  This can happen when the
     // preference is toggled, or early during startup if the preference is
     // already enabled. In a lot of cases the model will be in the cache so it
     // won't actually be fetched from the network.
     // We delay the first model fetch to avoid slowing down browser startup.
     ScheduleFetchModel(kInitialClientModelFetchDelayMs);
@@ skipping 98 matching lines @@
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_CREATED);
   if (!model_.get()) {
     // Model might not be ready or maybe there was an error.
     return;
   }
   SendModelToProcess(Source<RenderProcessHost>(source).ptr());
 }
 
 void ClientSideDetectionService::SendModelToProcess(
     RenderProcessHost* process) {
-  VLOG(2) << "Sending phishing model to renderer";
-  process->Send(new SafeBrowsingMsg_SetPhishingModel(model_str_));
+  Profile* profile = Profile::FromBrowserContext(process->browser_context());
+  std::string model;
+  if (profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {

[noelutz, 2011/10/18 00:33:42]

Why not simply wait until enabled_ is set in SetEnabledAndRefreshState(...) and
then use that value instead of reading the pref ourselves?

+    VLOG(2) << "Sending phishing model to RenderProcessHost @" << process;
+    model = model_str_;
+  } else {
+    VLOG(2) << "Disabling client-side phishing detection for "
+            << "RenderProcessHost @" << process;
+  }
+  process->Send(new SafeBrowsingMsg_SetPhishingModel(model));
 }
 
 void ClientSideDetectionService::SendModelToRenderers() {
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     SendModelToProcess(i.GetCurrentValue());
   }
 }
 
 void ClientSideDetectionService::ScheduleFetchModel(int64 delay_ms) {
@@ skipping 332 matching lines @@
                                                 &whitelist_patterns);
     for (size_t j = 0; j < whitelist_patterns.size(); ++j) {
       if (whitelist_patterns[j] == canonical_url_as_pattern) {
         return true;
       }
     }
   }
   return false;
 }
 }  // namespace safe_browsing