SafeBrowsing: DatabaseManager owns the V4GetHashProtocolManager

chrome/browser/safe_browsing/safe_browsing_service.h

 // 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_
 
@@ skipping 40 matching lines @@
 class ClientSideDetectionService;
 class DownloadProtectionService;
 struct SafeBrowsingProtocolConfig;
 class SafeBrowsingDatabaseManager;
 class SafeBrowsingPingManager;
 class SafeBrowsingProtocolManager;
 class SafeBrowsingProtocolManagerDelegate;
 class SafeBrowsingServiceFactory;
 class SafeBrowsingUIManager;
 class SafeBrowsingURLRequestContextGetter;
+struct V4GetHashProtocolConfig;
 
 #if defined(FULL_SAFE_BROWSING)
 class IncidentReportingService;
 class OffDomainInclusionDetector;
 class ResourceRequestDetector;
 #endif
 
 // Construction needs to happen on the main thread.
 // The SafeBrowsingService owns both the UI and Database managers which do
 // the heavylifting of safebrowsing service. Both of these managers stay
@@ skipping 23 matching lines @@
   void Initialize();
 
   // Called on the main thread to let us know that the io_thread is going away.
   void ShutDown();
 
   // Called on UI thread to decide if the download file's sha256 hash
   // should be calculated for safebrowsing.
   bool DownloadBinHashNeeded() const;
 
   // Create a protocol config struct.
   virtual SafeBrowsingProtocolConfig GetProtocolConfig() const;

[Nathan Parker, 2016/02/17 15:53:28]

Do these need to be public?

[kcarattini, 2016/02/18 02:55:29]

Turns out yes -- blacklist_state_fetcher calls it.

 
+  // Create a v4 protocol config struct.
+  virtual V4GetHashProtocolConfig GetV4GetHashProtocolConfig() const;

[Nathan Parker, 2016/02/17 15:53:28]

I probably missed this before... but would this be better as
"V4ProtocolConfig()", so it can be shared between get full hash code and update
code?

I realize I'm adding lots of constraints for steering this towards future
compatibility, but these changes will make it a lot cleaner later.  Thank you!

[kcarattini, 2016/02/17 22:44:42]

I figured the Update config would need a lot more than the GetHash config which
is why I separated them.  If you prefer to use the same one, I'll rename and
move to util.cc in a followup cl.

+
+  // Returns the client_name field for both V3 and V4 protocol manager configs.
+  std::string GetProtocolConfigClientName() const;
+
   // Get current enabled status. Must be called on IO thread.
   bool enabled() const {
     DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
     return enabled_;
   }
 
   // Whether the service is enabled by the current set of profiles.
   bool enabled_by_prefs() const {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return enabled_by_prefs_;
@@ skipping 193 matching lines @@
   SafeBrowsingServiceFactory() { }
   virtual ~SafeBrowsingServiceFactory() { }
   virtual SafeBrowsingService* CreateSafeBrowsingService() = 0;
  private:
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactory);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_