V4Only: In V4Only mode use PVer4 for all SafeBrowsing operations

chrome/browser/safe_browsing/services_delegate_impl.cc

Index: chrome/browser/safe_browsing/services_delegate_impl.cc
diff --git a/chrome/browser/safe_browsing/services_delegate_impl.cc b/chrome/browser/safe_browsing/services_delegate_impl.cc
index 2097437e71f065d5f3f435832d8345ec6f3c49f5..e239d89c548adb633b24973f65817183ca27ec70 100644
--- a/chrome/browser/safe_browsing/services_delegate_impl.cc
+++ b/chrome/browser/safe_browsing/services_delegate_impl.cc
@@ -54,13 +54,17 @@ void ServicesDelegateImpl::InitializeCsdService(
 #endif  // defined(SAFE_BROWSING_CSD)
 }
 
-const scoped_refptr<V4LocalDatabaseManager>&
+const scoped_refptr<SafeBrowsingDatabaseManager>&
 ServicesDelegateImpl::v4_local_database_manager() const {
   return v4_local_database_manager_;
 }
 
 void ServicesDelegateImpl::Initialize() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  v4_local_database_manager_ =
+      V4LocalDatabaseManager::Create(SafeBrowsingService::GetBaseFilename());

[Scott Hess - ex-Googler, 2016/12/08 06:02:55]

This presumably needs to be here so that someone gets the right
database_manager() somewhere.  As such, perhaps it should be documented that it
needs to be above the rest.

[Nathan Parker, 2016/12/08 23:00:58]

Done.

+
   download_service_.reset(
       (services_creator_ &&
        services_creator_->CanCreateDownloadProtectionService())
@@ -76,9 +80,6 @@ void ServicesDelegateImpl::Initialize() {
        services_creator_->CanCreateResourceRequestDetector())
           ? services_creator_->CreateResourceRequestDetector()
           : CreateResourceRequestDetector());
-
-  v4_local_database_manager_ =
-      V4LocalDatabaseManager::Create(SafeBrowsingService::GetBaseFilename());
 }
 
 void ServicesDelegateImpl::ShutdownServices() {