Make safe browsing work in a multi-profile environment.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
@@ skipping 232 matching lines @@
 
     PrefService* prefs = process->profile()->GetPrefs();
     // Currently this pref is only registered if applied via a policy.
     if (prefs->HasPrefPath(prefs::kDisable3DAPIs) &&
         prefs->GetBoolean(prefs::kDisable3DAPIs)) {
       // Turn this policy into a command line switch.
       command_line->AppendSwitch(switches::kDisable3DAPIs);
     }
 
     // Disable client-side phishing detection in the renderer if it is disabled
-    // in the browser process.
-    if (!g_browser_process->safe_browsing_detection_service())
+    // in the Profile preferences or the browser process.
+    if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
+        !g_browser_process->safe_browsing_detection_service()) {
       command_line->AppendSwitch(switches::kDisableClientSidePhishingDetection);
+    }
 
     static const char* const kSwitchNames[] = {
       switches::kAllowHTTPBackgroundPage,
       switches::kAllowScriptingGallery,
       switches::kAppsCheckoutURL,
       switches::kAppsGalleryURL,
       switches::kDebugPrint,
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
       // Enabled by default in Google Chrome builds, except on CrOS.
       switches::kDisablePrintPreview,
@@ skipping 364 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome