Fixes the cache lock issue.

net/http/http_transaction_test_util.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 NET_HTTP_HTTP_TRANSACTION_TEST_UTIL_H_
 #define NET_HTTP_HTTP_TRANSACTION_TEST_UTIL_H_
 
 #include "net/http/http_transaction.h"
 
 #include <stdint.h>
 
+#include <memory>
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
+#include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_error_details.h"
 #include "net/base/net_errors.h"
 #include "net/base/request_priority.h"
 #include "net/base/test_completion_callback.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_info.h"
@@ skipping 167 matching lines @@
                              const CompletionCallback& callback) override;
 
   int RestartWithAuth(const AuthCredentials& credentials,
                       const CompletionCallback& callback) override;
 
   bool IsReadyToRestartForAuth() override;
 
   int Read(IOBuffer* buf,
            int buf_len,
            const CompletionCallback& callback) override;
+
   void PopulateNetErrorDetails(NetErrorDetails* details) const override;
 
   void StopCaching() override;
 
   bool GetFullRequestHeaders(HttpRequestHeaders* headers) const override;
 
   int64_t GetTotalReceivedBytes() const override;
 
   int64_t GetTotalSentBytes() const override;
 
@@ skipping 60 matching lines @@
 
   // NetLog ID of the fake / non-existent underlying socket used by the
   // connection. Requires Start() be passed a NetLogWithSource with a real
   // NetLog to
   // be initialized.
   unsigned int socket_log_id_;
 
   bool done_reading_called_;
 
   base::WeakPtrFactory<MockNetworkTransaction> weak_factory_;
-
 };
 
 class MockNetworkLayer : public HttpTransactionFactory,
                          public base::SupportsWeakPtr<MockNetworkLayer> {
  public:
   MockNetworkLayer();
   ~MockNetworkLayer() override;
 
   int transaction_count() const { return transaction_count_; }
   bool done_reading_called() const { return done_reading_called_; }
@@ skipping 45 matching lines @@
   bool stop_caching_called_;
   RequestPriority last_create_transaction_priority_;
 
   // By default clock_ is NULL but it can be set to a custom clock by test
   // frameworks using SetClock.
   base::Clock* clock_;
 
   base::WeakPtr<MockNetworkTransaction> last_transaction_;
 };
 
+struct Context {
+  Context();
+  ~Context();
+
+  int result;
+  TestCompletionCallback callback;
+  std::unique_ptr<HttpTransaction> trans;
+};
+
 //-----------------------------------------------------------------------------
 // helpers
 
 // read the transaction completely
 int ReadTransaction(HttpTransaction* trans, std::string* result);
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_TRANSACTION_TEST_UTIL_H_