ClientSideDetectionService model fetch should honor kSbDisableAutoUpdate switch.

chrome/browser/safe_browsing/client_side_detection_service.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_switches.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/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "crypto/sha2.h"
 #include "google_apis/google_api_keys.h"
@@ skipping 234 matching lines @@
 
 void ClientSideDetectionService::SendModelToRenderers() {
   for (content::RenderProcessHost::iterator i(
           content::RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
     SendModelToProcess(i.GetCurrentValue());
   }
 }
 
 void ClientSideDetectionService::ScheduleFetchModel(int64 delay_ms) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kSbDisableAutoUpdate))
+    return;

[noelutz, 2013/04/17 22:36:45]

There are two other places in this file where we issue HTTP requests.

The first one is if there is a client-side phishing hit.  This only happens if
there is a phishing model present so we should be good there given that we
always fetch it.

The second case happens if we show a malware interstitial.  Do we ever send hash
server requests if that flag is set?  Does it only disable update requests or
all SB requests?  If hash server requests are still sent then there might be a
slight chance of us sending a malware report even if that flag is set.  Is that
acceptable?

[mattm, 2013/04/17 23:12:17]

I think you're thinking of the MalwareDetails class, the malware stuff in this
file is the new malware IP blacklisting stuff kewang is working on, which also
depends on the phishing model being present, if I'm remembering correctly.

[noelutz, 2013/04/17 23:36:48]

You're absolutely right.  Thanks for refreshing my memory.

   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&ClientSideDetectionService::StartFetchModel,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(delay_ms));
 }
 
 void ClientSideDetectionService::StartFetchModel() {
   if (enabled_) {
     // Start fetching the model either from the cache or possibly from the
@@ skipping 351 matching lines @@
     const std::string& report_url) {
   std::string url = report_url;
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty()) {
     base::StringAppendF(&url, "?key=%s",
                         net::EscapeQueryParamValue(api_key, true).c_str());
   }
   return url;
 }
 }  // namespace safe_browsing