Turn on client-side phishing detection for UMA users with SafeBrowsing enabled.

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2010 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/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/safe_browsing/client_side_detection_service.h"

[noelutz, 2011/03/28 20:55:16]

Is this header necessary?

[Brian Ryner, 2011/03/29 00:04:41]

Whoops, this was left over from a code reorganization that I ended up deciding
not to do.  Removed.

 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/pref_names.h"
@@ skipping 208 matching lines @@
       client,
       NewRunnableMethod(this,
                         &SafeBrowsingService::CheckDownloadHashOnSBThread,
                         check),
       download_hashcheck_timeout_ms_);
   return false;
 }
 
 bool SafeBrowsingService::MatchCsdWhitelistUrl(const GURL& url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  DCHECK(enable_csd_whitelist_);
   if (!enabled_ || !enable_csd_whitelist_ || !MakeDatabaseAvailable()) {
-    // There is something funky going on here.  Just to be safe we return
-    // true in this case.
+    // There is something funky going on here -- for example, perhaps the user
+    // has not restarted since enabling metrics reporting, so we haven't
+    // enabled the csd whitelist yet.  Just to be safe we return true in this
+    // case.
     return true;
   }
   return database_->ContainsCsdWhitelistedUrl(url);
 }
 
 bool SafeBrowsingService::CheckBrowseUrl(const GURL& url,
                                          Client* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!enabled_)
     return true;
@@ skipping 615 matching lines @@
 
   CommandLine* cmdline = CommandLine::ForCurrentProcess();
   enable_download_protection_ =
       !cmdline->HasSwitch(switches::kSbDisableDownloadProtection);
 
   // We only download the csd-whitelist if client-side phishing detection is
   // enabled and if the user has opted in with stats collection.  Note: we
   // cannot check whether the metrics_service() object is created because it
   // may be initialized after this method is called.
   enable_csd_whitelist_ =
-      (cmdline->HasSwitch(switches::kEnableClientSidePhishingDetection) &&
+      (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
        local_state && local_state->GetBoolean(prefs::kMetricsReportingEnabled));
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &SafeBrowsingService::OnIOInitialize, client_key, wrapped_key,
           request_context_getter));
 }
 
 void SafeBrowsingService::OnCloseDatabase() {
@@ skipping 275 matching lines @@
   check->is_download = true;
   check->timeout_task =
       NewRunnableMethod(this, &SafeBrowsingService::TimeoutCallback, check);
   checks_.insert(check);
 
   safe_browsing_thread_->message_loop()->PostTask(FROM_HERE, task);
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, check->timeout_task, timeout_ms);
 }