Make safe browsing work in a multi-profile environment.

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 984 matching lines @@
 }
 
 void BrowserProcessImpl::CreateSafeBrowsingDetectionService() {
   DCHECK(safe_browsing_detection_service_.get() == NULL);
   // Set this flag to true so that we don't retry indefinitely to
   // create the service class if there was an error.
   created_safe_browsing_detection_service_ = true;
 
   FilePath model_file_dir;
   Profile* profile = profile_manager() ?
     profile_manager()->GetDefaultProfile() : NULL;

[mattm, 2011/06/23 21:40:40]

Did you see my comment about the client side phishing detection?  This will need
some changes too.  

I guess what you'd want to do is remove the pref check from here and then
somehow pipe the value into ChromeContentRendererClient::RenderViewCreated to
choose whether to do the PhishingClassifierDelegate::Create. 
(ChromeContentBrowserClient::AppendExtraCommandLineSwitches does this right now
by passing kDisableClientSidePhishingDetection when the service object hasn't
been created, so I think you'd just have to move the pref check there.)


(And like SafeBrowsingService, change this in the next CL to only start the
ClientSideDetectionService when needed.)

[Miranda Callahan, 2011/07/07 17:35:50]

Done.

   if (IsSafeBrowsingDetectionServiceEnabled() &&
       PathService::Get(chrome::DIR_USER_DATA, &model_file_dir) &&
-      profile && profile->GetRequestContext()) {
+      profile &&
+      profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled) &&
+      profile->GetRequestContext()) {
     safe_browsing_detection_service_.reset(
         safe_browsing::ClientSideDetectionService::Create(
             model_file_dir, profile->GetRequestContext()));

[mattm, 2011/06/23 21:40:40]

I think this should use the system request context.

[Miranda Callahan, 2011/07/07 17:35:50]

Done.

   }
 }
 
 bool BrowserProcessImpl::IsSafeBrowsingDetectionServiceEnabled() {
   // The safe browsing client-side detection is enabled only if the switch is
   // not disabled and when safe browsing related stats are allowed to be
   // collected.
 #ifdef OS_CHROMEOS
   return false;
 #else
@@ skipping 113 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)