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 917 matching lines @@
   print_preview_tab_controller_ = new printing::PrintPreviewTabController();
 }
 
 void BrowserProcessImpl::CreateBackgroundPrintingManager() {
   DCHECK(background_printing_manager_.get() == NULL);
   background_printing_manager_.reset(new printing::BackgroundPrintingManager());
 }
 
 void BrowserProcessImpl::CreateSafeBrowsingService() {
   DCHECK(safe_browsing_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_service_ = true;
 #if defined(ENABLE_SAFE_BROWSING)
   safe_browsing_service_ = SafeBrowsingService::CreateSafeBrowsingService();
   safe_browsing_service_->Initialize();
 #endif
 }
 
 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;
 
 #if defined(ENABLE_SAFE_BROWSING)
   FilePath model_file_dir;
-  Profile* profile = profile_manager() ?
-    profile_manager()->GetDefaultProfile() : NULL;
   if (IsSafeBrowsingDetectionServiceEnabled() &&
-      PathService::Get(chrome::DIR_USER_DATA, &model_file_dir) &&
-      profile && profile->GetRequestContext()) {
+      PathService::Get(chrome::DIR_USER_DATA, &model_file_dir)) {
     safe_browsing_detection_service_.reset(
         safe_browsing::ClientSideDetectionService::Create(
-            model_file_dir, profile->GetRequestContext()));
+            model_file_dir, g_browser_process->system_request_context()));
   }
 #endif
 }
 
 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.
 #if defined(ENABLE_SAFE_BROWSING) && !defined(OS_CHROMEOS)
   return !CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 114 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)