[net] Better StopCaching() handling for HttpCache::Transaction.

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_UNITTEST_H_
 #define NET_HTTP_HTTP_TRANSACTION_UNITTEST_H_
 
 #include "net/http/http_transaction.h"
 
 #include <stdint.h>
@@ skipping 34 matching lines @@
   TEST_MODE_SYNC_NET_READ  = 1 << 1,
   TEST_MODE_SYNC_CACHE_START = 1 << 2,
   TEST_MODE_SYNC_CACHE_READ  = 1 << 3,
   TEST_MODE_SYNC_CACHE_WRITE  = 1 << 4,
   TEST_MODE_SYNC_ALL = (TEST_MODE_SYNC_NET_START | TEST_MODE_SYNC_NET_READ |
                         TEST_MODE_SYNC_CACHE_START | TEST_MODE_SYNC_CACHE_READ |
                         TEST_MODE_SYNC_CACHE_WRITE),
   TEST_MODE_SLOW_READ = 1 << 5
 };
 
-typedef void (*MockTransactionHandler)(const HttpRequestInfo* request,
-                                       std::string* response_status,
-                                       std::string* response_headers,
-                                       std::string* response_data);
+using MockTransactionReadHandler = int (*)(int64 content_length,
+                                           int64 offset,
+                                           IOBuffer* buf,
+                                           int buf_len);
+using MockTransactionHandler = void (*)(const HttpRequestInfo* request,
+                                        std::string* response_status,
+                                        std::string* response_headers,
+                                        std::string* response_data);
 
 struct MockTransaction {
   const char* url;
   const char* method;
   // If |request_time| is unspecified, the current time will be used.
   base::Time request_time;
   const char* request_headers;
   int load_flags;
   const char* status;
   const char* response_headers;
   // If |response_time| is unspecified, the current time will be used.
   base::Time response_time;
   const char* data;
   int test_mode;
   MockTransactionHandler handler;
+  MockTransactionReadHandler read_handler;
   scoped_refptr<X509Certificate> cert;
   CertStatus cert_status;
   int ssl_connection_status;
   // Value returned by MockNetworkTransaction::Start (potentially
   // asynchronously if |!(test_mode & TEST_MODE_SYNC_NET_START)|.)
   Error return_code;
 };
 
 extern const MockTransaction kSimpleGET_Transaction;
 extern const MockTransaction kSimplePOST_Transaction;
@@ skipping 160 matching lines @@
  private:
   int StartInternal(const HttpRequestInfo* request,
                     const CompletionCallback& callback,
                     const BoundNetLog& net_log);
   void CallbackLater(const CompletionCallback& callback, int result);
   void RunCallback(const CompletionCallback& callback, int result);
 
   const HttpRequestInfo* request_;
   HttpResponseInfo response_;
   std::string data_;
-  int data_cursor_;
+  int64 data_cursor_;
+  int64 content_length_;
   int test_mode_;
   RequestPriority priority_;
+  MockTransactionReadHandler read_handler_;
   CreateHelper* websocket_handshake_stream_create_helper_;
+  BeforeNetworkStartCallback before_network_start_callback_;
   base::WeakPtr<MockNetworkLayer> transaction_factory_;
   int64 received_bytes_;
   int64_t sent_bytes_;
 
   // NetLog ID of the fake / non-existent underlying socket used by the
   // connection. Requires Start() be passed a BoundNetLog with a real NetLog to
   // be initialized.
   unsigned int socket_log_id_;
 
   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_; }
   bool stop_caching_called() const { return stop_caching_called_; }
   void TransactionDoneReading();
   void TransactionStopCaching();
 
+  // Resets the transaction count. Can be called after test setup in order to
+  // make test expectations independent of how test setup is performed.
+  void ResetTransactionCount();
+
   // Returns the last priority passed to CreateTransaction, or
   // DEFAULT_PRIORITY if it hasn't been called yet.
   RequestPriority last_create_transaction_priority() const {
     return last_create_transaction_priority_;
   }
 
   // Returns the last transaction created by
   // CreateTransaction. Returns a NULL WeakPtr if one has not been
   // created yet, or the last transaction has been destroyed, or
   // ClearLastTransaction() has been called and a new transaction
@@ skipping 36 matching lines @@
 
 //-----------------------------------------------------------------------------
 // helpers
 
 // read the transaction completely
 int ReadTransaction(HttpTransaction* trans, std::string* result);
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_TRANSACTION_UNITTEST_H_