Handle timeout for update requests.

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 70 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
                            TestGetUpdatesErrorHandlingNetwork);
   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
                            TestGetUpdatesErrorHandlingResponseCode);
   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, TestGetUpdatesNoError);
   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
                            TestGetUpdatesWithOneBackoff);
   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
                            TestBase64EncodingUsesUrlEncoding);
   FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest, TestDisableAutoUpdates);
+  FRIEND_TEST_ALL_PREFIXES(V4UpdateProtocolManagerTest,
+                           TestGetUpdatesHasTimeout);
   friend class V4UpdateProtocolManagerFactoryImpl;
 
   // Fills a FetchThreatListUpdatesRequest protocol buffer for a request.
   // Returns the serialized and base64 URL encoded request as a string.
   std::string GetBase64SerializedUpdateRequestProto();
 
   // The method to populate |gurl| with the URL to be sent to the server.
   // |request_base64| is the base64 encoded form of an instance of the protobuf
   // FetchThreatListUpdatesRequest. Also sets the appropriate header values for
   // sending PVer4 requests in |headers|.
   void GetUpdateUrlAndHeaders(const std::string& request_base64,
                               GURL* gurl,
                               net::HttpRequestHeaders* headers) const;
 
   // Parses the base64 encoded response received from the server as a
   // FetchThreatListUpdatesResponse protobuf and returns each of the
   // ListUpdateResponse protobufs contained in it as a vector.
   // Returns true if parsing is successful, false otherwise.
   bool ParseUpdateResponse(const std::string& data_base64,
                            ParsedServerResponse* parsed_server_response);
 
   // Resets the update error counter and multiplier.
   void ResetUpdateErrors();
 
+  // Called when update request times out. Cancels the existing request and
+  // re-sends the update request.
+  void HandleTimeout();
+
   // Updates internal update and backoff state for each update response error,
   // 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;
@@ skipping 41 matching lines @@
 
   // 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_;
 
+  // Used to interrupt and re-issue update requests that take too long.

[Nathan Parker, 2016/11/08 23:39:29]

It doesn't re-issue, it just reschedules now, yes? 

And the CL description needs updating as well, to this effect.

[vakh (use Gerrit instead), 2016/11/09 00:08:51]

Done.

+  base::OneShotTimer timeout_timer_;
+
   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,
       V4UpdateCallback callback) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(V4UpdateProtocolManagerFactory);
 };
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_V4_UPDATE_PROTOCOL_MANAGER_H_