[fsp] Initial implementation of timeout logic for requests.

chrome/browser/chromeos/file_system_provider/request_manager.h

 // Copyright 2014 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 CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_REQUEST_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_REQUEST_MANAGER_H_
 
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/files/file.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_ptr.h"

[hashimoto, 2014/04/18 05:28:09]

nit: This line is duplicated.

[mtomasz, 2014/04/18 05:56:18]

Done.

+#include "base/timer/timer.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 
 namespace base {
 class DictionaryValue;
 }  // namespace base
 
 namespace chromeos {
 namespace file_system_provider {
 
 typedef base::Callback<void(scoped_ptr<base::DictionaryValue> result,
@@ skipping 16 matching lines @@
   // then the request is disposed, after handling the |response|. On error,
   // returns false, and the request is disposed.
   bool FulfillRequest(int request_id,
                       scoped_ptr<base::DictionaryValue> response,
                       bool has_next);
 
   // Handles error response for the |request_id|. If handling the error fails,
   // returns false. Always disposes the request.
   bool RejectRequest(int request_id, base::File::Error error);
 
+  // Sets a custom timeout in milliseconds for tests. The new timeout value will
+  // be applied to new requests
+  void SetTimeoutForTests(int timeout);
+
  private:
   struct Request {
     Request();
     ~Request();
 
+    // Timer for discarding the request during a timeout.
+    base::OneShotTimer<RequestManager> timeout_timer;
+
     // Callback to be called on success.
     SuccessCallback success_callback;
 
     // Callback to be called on error.
     ErrorCallback error_callback;
+
+   private:
+    DISALLOW_COPY_AND_ASSIGN(Request);
   };
 
-  typedef std::map<int, Request> RequestMap;
+  typedef std::map<int, Request*> RequestMap;
+
+  // Called when a request with |request_id| timeouts.
+  void OnRequestTimeout(int request_id);
 
   RequestMap requests_;
   int next_id_;
+  int timeout_;

[hashimoto, 2014/04/18 05:28:09]

Why don't you use base::TimeDelta which takes care about time units?
The same goes for SetTimeoutForTests.

[mtomasz, 2014/04/18 05:56:18]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(RequestManager);
 };
 
 }  // namespace file_system_provider
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_FILE_SYSTEM_PROVIDER_REQUEST_MANAGER_H_