Add a whitelist for the new binary download protection.

chrome/browser/safe_browsing/safe_browsing_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/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
@@ skipping 143 matching lines @@
     factory_ = g_safe_browsing_service_factory_impl.Pointer();
   return factory_->CreateSafeBrowsingService();
 }
 
 SafeBrowsingService::SafeBrowsingService()
     : database_(NULL),
       protocol_manager_(NULL),
       enabled_(false),
       enable_download_protection_(false),
       enable_csd_whitelist_(false),
+      enable_download_whitelist_(false),
       update_in_progress_(false),
       database_update_in_progress_(false),
       closing_database_(false),
       download_urlcheck_timeout_ms_(kDownloadUrlCheckTimeoutMs),
       download_hashcheck_timeout_ms_(kDownloadHashCheckTimeoutMs) {
 #if !defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection) &&
       (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableSanitizedClientSidePhishingDetection) ||
@@ skipping 506 matching lines @@
 
   FilePath path;
   bool result = PathService::Get(chrome::DIR_USER_DATA, &path);
   DCHECK(result);
   path = path.Append(chrome::kSafeBrowsingBaseFilename);
 
   const base::TimeTicks before = base::TimeTicks::Now();
 
   SafeBrowsingDatabase* database =
       SafeBrowsingDatabase::Create(enable_download_protection_,
-                                   enable_csd_whitelist_);
+                                   enable_csd_whitelist_,
+                                   enable_download_whitelist_);
 
   database->Init(path);
   {
     // Acquiring the lock here guarantees correct ordering between the writes to
     // the new database object above, and the setting of |databse_| below.
     base::AutoLock lock(database_lock_);
     database_ = database;
   }
 
   BrowserThread::PostTask(
@@ skipping 199 matching lines @@
   enable_csd_whitelist_ = false;
 #else
   enable_csd_whitelist_ =
       (!cmdline->HasSwitch(switches::kDisableClientSidePhishingDetection) &&
        (!cmdline->HasSwitch(
            switches::kDisableSanitizedClientSidePhishingDetection) ||
         (local_state &&
          local_state->GetBoolean(prefs::kMetricsReportingEnabled))));
 #endif
 
+  const PrefService::Preference* pref = (local_state ?
+    local_state->FindPreference(
+        prefs::kSafeBrowsingOptinDownloadProtectionEnabled) : NULL);
+  bool pref_value = false;
+  enable_download_whitelist_ = (pref &&
+                                pref->GetValue()->GetAsBoolean(&pref_value) &&
+                                pref_value);

[mattm, 2011/09/13 00:29:02]

Oh, thinking about this a bit harder, this isn't quite right. 
Profile::RegisterUserPrefs is registering the pref in the profile prefs, not the
local state prefs.   You could register it in local_state, but for the
multi-profile world it would be best to keep it registered in the profile.  

That means you'd have to either change the code to keep track of whether any
loaded profiles have it enabled (similar to the way safebrowsing itself is
enabled) or just always update the download whitelist.

[noelutz, 2011/09/13 20:35:39]

That does seem a bit complicated.  How about we always update that whitelist
since it is so small?  Also, we're talking about making that feature an opt-out
like SafeBrowsing so most people will have it enabled.

[mattm, 2011/09/14 01:15:18]

Yeah, just always updating it sounds fine.

+
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           this, &SafeBrowsingService::OnIOInitialize, client_key, wrapped_key,
           request_context_getter));
 }
 
 void SafeBrowsingService::Stop() {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ skipping 422 matching lines @@
   }
 
   if (enable)
     Start();
   else
     Stop();
 
   if (csd_service_.get())
     csd_service_->SetEnabled(enable);
 }