Http Cache: Handle the asynchronous instantiation of the

backend. We queue all trasnactions that reach Start before
we are done creating the disk cache.

BUG=26729
TEST=unittests.


Review URL: http://codereview.chromium.org/2002002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46745 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h
index 9d13b11..4d16a25 100644
--- a/net/http/http_cache_transaction.h
+++ b/net/http/http_cache_transaction.h
@@ -111,6 +111,8 @@ class HttpCache::Transaction : public HttpTransaction {
 
   enum State {
     STATE_NONE,
+    STATE_GET_BACKEND,
+    STATE_GET_BACKEND_COMPLETE,
     STATE_SEND_REQUEST,
     STATE_SEND_REQUEST_COMPLETE,
     STATE_SUCCESSFUL_SEND_REQUEST,
@@ -160,6 +162,8 @@ class HttpCache::Transaction : public HttpTransaction {
   // Each of these methods corresponds to a State value.  If there is an
   // argument, the value corresponds to the return of the previous state or
   // corresponding callback.
+  int DoGetBackend();
+  int DoGetBackendComplete(int result);
   int DoSendRequest();
   int DoSendRequestComplete(int result);
   int DoSuccessfulSendRequest();
@@ -202,9 +206,6 @@ class HttpCache::Transaction : public HttpTransaction {
   // layer (skipping the cache entirely).
   bool ShouldPassThrough();
 
-  // Associates this transaction with a cache entry.
-  int AddToEntry();
-
   // Called to begin reading from the cache.  Returns network error code.
   int BeginCacheRead();
 
@@ -225,9 +226,6 @@ class HttpCache::Transaction : public HttpTransaction {
   // Returns a network error code.
   int BeginExternallyConditionalizedRequest();
 
-  // Called to begin a network transaction.  Returns network error code.
-  int BeginNetworkRequest();
-
   // Called to restart a network transaction after an error.  Returns network
   // error code.
   int RestartNetworkRequest();
@@ -332,7 +330,7 @@ class HttpCache::Transaction : public HttpTransaction {
   CompletionCallbackImpl<Transaction> io_callback_;
   scoped_refptr<CancelableCompletionCallback<Transaction> > cache_callback_;
   scoped_refptr<CancelableCompletionCallback<Transaction> >
-  write_headers_callback_;
+      write_headers_callback_;
 };
 
 }  // namespace net