Makes V4UpdateProtocolManager auto-schedule update fetching

chrome/browser/safe_browsing/local_database_manager.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.
 //
 // Safe Browsing Database Manager implementation that manages a local
 // database.  This is used by Desktop Chromium.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_
 
@@ skipping 10 matching lines @@
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "components/safe_browsing_db/database_manager.h"
+#include "components/safe_browsing_db/safebrowsing.pb.h"
 #include "components/safe_browsing_db/util.h"
+#include "components/safe_browsing_db/v4_protocol_manager_util.h"
+#include "components/safe_browsing_db/v4_update_protocol_manager.h"
 #include "url/gurl.h"
 
 namespace net {
 class URLRequestContext;
 class URLRequestContextGetter;
 }
 
 namespace safe_browsing {
 
 class SafeBrowsingService;
@@ skipping 33 matching lines @@
     std::vector<SBThreatType> url_results;
     std::vector<ThreatMetadata> url_metadata;
     std::vector<std::string> url_hit_hash;
     std::vector<SBFullHash> full_hashes;
     std::vector<SBThreatType> full_hash_results;
 
     SafeBrowsingDatabaseManager::Client* client;
     bool is_extended_reporting;
     bool need_get_hash;
     base::TimeTicks start;  // When check was sent to SB service.
-    ListType check_type;  // See comment in constructor.
+    ListType check_type;    // See comment in constructor.
     std::vector<SBThreatType> expected_threats;
     std::vector<SBPrefix> prefix_hits;
     std::vector<SBFullHashResult> cache_hits;
 
     // Invoke one of client's callbacks with these results.
     void OnSafeBrowsingResult();
 
     // Vends weak pointers for async callbacks on the IO thread, such as
     // timeout checks and replies from checks performed on the SB task runner.
     // TODO(lzheng): We should consider to use this time out check
@@ skipping 28 matching lines @@
   bool CheckResourceUrl(const GURL& url, Client* client) override;
   bool MatchCsdWhitelistUrl(const GURL& url) override;
   bool MatchMalwareIP(const std::string& ip_address) override;
   bool MatchDownloadWhitelistUrl(const GURL& url) override;
   bool MatchDownloadWhitelistString(const std::string& str) override;
   bool MatchInclusionWhitelistUrl(const GURL& url) override;
   bool MatchModuleWhitelistString(const std::string& str) override;
   bool IsMalwareKillSwitchOn() override;
   bool IsCsdWhitelistKillSwitchOn() override;
   void CancelCheck(Client* client) override;
-  void StartOnIOThread(
-      net::URLRequestContextGetter* request_context_getter,
-      const V4ProtocolConfig& config) override;
+  void StartOnIOThread(net::URLRequestContextGetter* request_context_getter,
+                       const V4ProtocolConfig& config) override;
   void StopOnIOThread(bool shutdown) override;
   bool download_protection_enabled() const override;
 
  protected:
   ~LocalSafeBrowsingDatabaseManager() override;
 
   // protected for tests.
   void NotifyDatabaseUpdateFinished(bool update_succeeded);
 
  private:
   // Called on the IO thread when the SafeBrowsingProtocolManager has received
   // the full hash results for prefix hits detected in the database.
   void HandleGetHashResults(SafeBrowsingCheck* check,
                             const std::vector<SBFullHashResult>& full_hashes,
                             const base::TimeDelta& cache_lifetime);
 
   friend class base::RefCountedThreadSafe<LocalSafeBrowsingDatabaseManager>;
   friend class SafeBrowsingServerTest;
   friend class SafeBrowsingServiceTest;
   friend class SafeBrowsingServiceTestHelper;
   friend class LocalDatabaseManagerTest;
-  FRIEND_TEST_ALL_PREFIXES(LocalDatabaseManagerTest,
-                           GetUrlSeverestThreatType);
+  FRIEND_TEST_ALL_PREFIXES(LocalDatabaseManagerTest, GetUrlSeverestThreatType);
   FRIEND_TEST_ALL_PREFIXES(LocalDatabaseManagerTest,
                            ServiceStopWithPendingChecks);
 
   typedef std::set<SafeBrowsingCheck*> CurrentChecks;
   typedef std::vector<SafeBrowsingCheck*> GetHashRequestors;
   typedef base::hash_map<SBPrefix, GetHashRequestors> GetHashRequests;
 
   // Clients that we've queued up for checking later once the database is ready.
   struct QueuedCheck {
     QueuedCheck(const ListType check_type,
@@ skipping 17 matching lines @@
       const std::vector<SBFullHashResult>& full_hashes);
 
   // Given a URL, compare all the possible host + path full hashes to the set of
   // provided full hashes.  Returns the threat type of the severest matching
   // result from |full_hashes|, or SAFE if none match.
   static SBThreatType GetUrlSeverestThreatType(
       const GURL& url,
       const std::vector<SBFullHashResult>& full_hashes,
       size_t* index);
 
+  // Return whether we are running headless, i.e. on a bot.
+  static bool IsRunningHeadless();
+
+  void UpdateRequestCompleted(const std::vector<ListUpdateResponse>& responses);
+
   // Called to stop operations on the io_thread. This may be called multiple
   // times during the life of the DatabaseManager. Should be called on IO
   // thread.
   void DoStopOnIOThread();
 
   // Returns whether |database_| exists and is accessible.
   bool DatabaseAvailable() const;
 
   // Called on the IO thread.  If the database does not exist, queues up a call
   // on the db thread to create it.  Returns whether the database is available.
@@ skipping 42 matching lines @@
   // checks them.
   void DatabaseLoadComplete();
 
   // Called on the database thread to add/remove chunks and host keys.
   void AddDatabaseChunks(
       const std::string& list,
       scoped_ptr<std::vector<scoped_ptr<SBChunkData>>> chunks,
       AddChunksCallback callback);
 
   void DeleteDatabaseChunks(
-      scoped_ptr<std::vector<SBChunkDelete> > chunk_deletes);
+      scoped_ptr<std::vector<SBChunkDelete>> chunk_deletes);
 
   void NotifyClientBlockingComplete(Client* client, bool proceed);
 
   void DatabaseUpdateFinished(bool update_succeeded);
 
   // Called on the db thread to close the database.  See CloseDatabase().
   void OnCloseDatabase();
 
   // Runs on the db thread to reset the database. We assume that resetting the
   // database is a synchronous operation.
@@ skipping 103 matching lines @@
 
   // Indicates if we're in the midst of trying to close the database.  If this
   // is true, nothing on the IO thread should access the database.
   bool closing_database_;
 
   std::deque<QueuedCheck> queued_checks_;
 
   // Timeout to use for safe browsing checks.
   base::TimeDelta check_timeout_;
 
+  // Stores the current status of the lists to download from the SafeBrowsing
+  // servers.
+  base::hash_map<UpdateListIdentifier, std::string> current_list_states_;

[Nathan Parker, 2016/04/01 01:04:52]

Do you want this in the local_database_manager, or a new database_manager? 
Mixing the two will make it harder to distinguish v3 from v4 functionality.

[vakh (use Gerrit instead), 2016/04/01 02:29:09]

I want to keep this CL small so I don't want to create a new DBManager right
now. I'll work on that once this CL has landed. Is that OK?

[Nathan Parker, 2016/04/01 17:56:58]

Sure, though it's probably better to not add it to local_db_mgr at all now,
since you'll just have to remove it.  And, by instantiating it, it may start
making network calls.

[vakh (use Gerrit instead), 2016/04/01 19:35:48]

Good point. Removed. Will add it in the V4DBManager.

+
+  // The protocol manager that downloads the hash prefix updates.
+  scoped_ptr<V4UpdateProtocolManager> v4_update_protocol_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(LocalSafeBrowsingDatabaseManager);
 };  // class LocalSafeBrowsingDatabaseManager
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_LOCAL_DATABASE_MANAGER_H_