Enable V4LocalDatabaseManager based on Finch.

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <vector>
 
@@ skipping 279 matching lines @@
 }
 
 void SafeBrowsingService::Initialize() {
   url_request_context_getter_ = new SafeBrowsingURLRequestContextGetter(
       g_browser_process->system_request_context());
 
   ui_manager_ = CreateUIManager();
 
   database_manager_ = CreateDatabaseManager();
 
+  services_delegate_->Initialize();
   services_delegate_->InitializeCsdService(url_request_context_getter_.get());
-  services_delegate_->InitializeServices();
 
   // Track the safe browsing preference of existing profiles.
   // The SafeBrowsingService will be started if any existing profile has the
   // preference enabled. It will also listen for updates to the preferences.
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (profile_manager) {
     std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles();
     // TODO(felt): I believe this for-loop is dead code. Confirm this and
     // remove in a future CL. See https://codereview.chromium.org/1341533002/
     DCHECK_EQ(0u, profiles.size());
@@ skipping 206 matching lines @@
 void SafeBrowsingService::StartOnIOThread(
     net::URLRequestContextGetter* url_request_context_getter) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (enabled_)
     return;
   enabled_ = true;
 
   SafeBrowsingProtocolConfig config = GetProtocolConfig();
   V4ProtocolConfig v4_config = GetV4ProtocolConfig();
 
+  services_delegate_->StartOnIOThread(url_request_context_getter, v4_config);
+
 #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
   DCHECK(database_manager_.get());
   database_manager_->StartOnIOThread(url_request_context_getter, v4_config);
 #endif
 
 #if defined(SAFE_BROWSING_DB_LOCAL)
   SafeBrowsingProtocolManagerDelegate* protocol_manager_delegate =
       GetProtocolManagerDelegate();
   if (protocol_manager_delegate) {
     protocol_manager_ = SafeBrowsingProtocolManager::Create(
         protocol_manager_delegate, url_request_context_getter, config);
     protocol_manager_->Initialize();
   }
 #endif
 
   DCHECK(!ping_manager_);
   ping_manager_ = SafeBrowsingPingManager::Create(
       url_request_context_getter, config);
 }
 
 void SafeBrowsingService::StopOnIOThread(bool shutdown) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
+  services_delegate_->StopOnIOThread(shutdown);

[Nathan Parker, 2016/04/30 00:22:29]

Should we do this in inverse order?  If it's started first, maybe it should be
stopped last.

[vakh (use Gerrit instead), 2016/04/30 00:51:50]

Done.

+
 #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
   database_manager_->StopOnIOThread(shutdown);
 #endif
   ui_manager_->StopOnIOThread(shutdown);
 
   if (enabled_) {
     enabled_ = false;
 
 #if defined(SAFE_BROWSING_DB_LOCAL)
     // This cancels all in-flight GetHash requests. Note that
@@ skipping 125 matching lines @@
     ping_manager()->ReportThreatDetails(report);
 }
 
 void SafeBrowsingService::ProcessResourceRequest(
     const ResourceRequestInfo& request) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   services_delegate_->ProcessResourceRequest(&request);
 }
 
 }  // namespace safe_browsing