Revert of Initialize and reset V4LocalDBManager. Instantiate V4Stores.

components/safe_browsing_db/v4_update_protocol_manager.h

 // 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.
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_V4_UPDATE_PROTOCOL_MANAGER_H_
 #define COMPONENTS_SAFE_BROWSING_DB_V4_UPDATE_PROTOCOL_MANAGER_H_
 
 // A class that implements Chrome's interface with the SafeBrowsing V4 update
 // protocol.
 //
@@ skipping 50 matching lines @@
   static std::unique_ptr<V4UpdateProtocolManager> Create(
       net::URLRequestContextGetter* request_context_getter,
       const V4ProtocolConfig& config,
       const base::hash_map<UpdateListIdentifier, std::string>&
           current_list_states,
       V4UpdateCallback callback);
 
   // net::URLFetcherDelegate interface.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
-  // Schedule the next update without backoff.
-  void ScheduleNextUpdate();
-
  protected:
   // Constructs a V4UpdateProtocolManager that issues network requests using
   // |request_context_getter|.
   // Schedules an update to get the hash prefixes for the lists in
   // |current_list_states|, and invoke |callback| when the results
   // are retrieved. The callback may be invoked synchronously.
   V4UpdateProtocolManager(
       net::URLRequestContextGetter* request_context_getter,
       const V4ProtocolConfig& config,
       const base::hash_map<UpdateListIdentifier, std::string>&
@@ skipping 36 matching lines @@
   // assuming that the current time is |now|.
   void HandleUpdateError(const base::Time& now);
 
   // Generates the URL for the update request and issues the request for the
   // lists passed to the constructor.
   void IssueUpdateRequest();
 
   // Returns whether another update is currently scheduled.
   bool IsUpdateScheduled() const;
 
-  // Schedule the next update with backoff specified.
-  void ScheduleNextUpdateWithBackoff(bool back_off);
+  // Schedule the next update, considering whether we are in backoff.
+  void ScheduleNextUpdate(bool back_off);
 
   // Schedule the next update, after the given interval.
   void ScheduleNextUpdateAfterInterval(base::TimeDelta interval);
 
   // Get the next update interval, considering whether we are in backoff.
   base::TimeDelta GetNextUpdateInterval(bool back_off);
 
   // The factory that controls the creation of V4UpdateProtocolManager.
   // This is used by tests.
   static V4UpdateProtocolManagerFactory* factory_;
@@ skipping 19 matching lines @@
   // The config of the client making Pver4 requests.
   const V4ProtocolConfig config_;
 
   // The context we use to issue network requests.
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   // ID for URLFetchers for testing.
   int url_fetcher_id_;
 
   // The callback that's called when GetUpdates completes.
-  V4UpdateCallback update_callback_;
+  V4UpdateCallback callback_;
 
   // The pending update request. The request must be canceled when the object is
   // destroyed.
   std::unique_ptr<net::URLFetcher> request_;
 
   // Timer to setup the next update request.
   base::OneShotTimer update_timer_;
 
-  base::Time last_response_time_;
-
   DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManager);
 };
 
 // Interface of a factory to create V4UpdateProtocolManager.  Useful for tests.
 class V4UpdateProtocolManagerFactory {
  public:
   V4UpdateProtocolManagerFactory() {}
   virtual ~V4UpdateProtocolManagerFactory() {}
   virtual std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
       net::URLRequestContextGetter* request_context_getter,
       const V4ProtocolConfig& config,
       const base::hash_map<UpdateListIdentifier, std::string>&
           current_list_states,
       V4UpdateCallback callback) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManagerFactory);
 };
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_V4_UPDATE_PROTOCOL_MANAGER_H_