Enable V4LocalDatabaseManager based on Finch.

chrome/browser/safe_browsing/safe_browsing_service.cc

Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 4cc6b1a60e9284863d66a06c5cfdb25e7a6fa7b3..e0528d2b4e17547cc9cbac21d93036e4fbe52bbf 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -297,8 +297,8 @@ void SafeBrowsingService::Initialize() {
 
   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
@@ -525,6 +525,8 @@ void SafeBrowsingService::StartOnIOThread(
   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);
@@ -548,6 +550,8 @@ void SafeBrowsingService::StartOnIOThread(
 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