V4Only: In V4Only mode use PVer4 for all SafeBrowsing operations

chrome/browser/safe_browsing/services_delegate_impl.cc

 // Copyright 2016 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/services_delegate_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 36 matching lines @@
     net::URLRequestContextGetter* context_getter) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 #if defined(SAFE_BROWSING_CSD)
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableClientSidePhishingDetection)) {
     csd_service_.reset(ClientSideDetectionService::Create(context_getter));
   }
 #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())
           ? services_creator_->CreateDownloadProtectionService()
           : CreateDownloadProtectionService());
   incident_service_.reset(
       (services_creator_ &&
        services_creator_->CanCreateIncidentReportingService())
           ? services_creator_->CreateIncidentReportingService()
           : CreateIncidentReportingService());
   resource_request_detector_.reset(
       (services_creator_ &&
        services_creator_->CanCreateResourceRequestDetector())
           ? services_creator_->CreateResourceRequestDetector()
           : CreateResourceRequestDetector());
-
-  v4_local_database_manager_ =
-      V4LocalDatabaseManager::Create(SafeBrowsingService::GetBaseFilename());
 }
 
 void ServicesDelegateImpl::ShutdownServices() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // The IO thread is going away, so make sure the ClientSideDetectionService
   // dtor executes now since it may call the dtor of URLFetcher which relies
   // on it.
   csd_service_.reset();
 
   resource_request_detector_.reset();
@@ skipping 77 matching lines @@
   }
 }
 
 void ServicesDelegateImpl::StopOnIOThread(bool shutdown) {
   if (v4_local_database_manager_.get()) {
     v4_local_database_manager_->StopOnIOThread(shutdown);
   }
 }
 
 }  // namespace safe_browsing