Exposing CacheEntryStatus (former TransactionPattern) via UrlRequest

net/http/http_cache_transaction.h

 // Copyright (c) 2012 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.
 
 // This file declares HttpCache::Transaction, a private class of HttpCache so
 // it should only be included by http_cache.cc
 
 #ifndef NET_HTTP_HTTP_CACHE_TRANSACTION_H_
 #define NET_HTTP_HTTP_CACHE_TRANSACTION_H_
 
@@ skipping 211 matching lines @@
     STATE_NETWORK_READ,
     STATE_NETWORK_READ_COMPLETE,
     STATE_CACHE_READ_DATA,
     STATE_CACHE_READ_DATA_COMPLETE,
     STATE_CACHE_WRITE_DATA,
     STATE_CACHE_WRITE_DATA_COMPLETE,
     STATE_CACHE_WRITE_TRUNCATED_RESPONSE,
     STATE_CACHE_WRITE_TRUNCATED_RESPONSE_COMPLETE
   };
 
-  // Used for categorizing transactions for reporting in histograms. Patterns
-  // cover relatively common use cases being measured and considered for
-  // optimization. Many use cases that are more complex or uncommon are binned
-  // as PATTERN_NOT_COVERED, and details are not reported.
-  // NOTE: This enumeration is used in histograms, so please do not add entries
-  // in the middle.
-  enum TransactionPattern {
-    PATTERN_UNDEFINED,
-    PATTERN_NOT_COVERED,
-    PATTERN_ENTRY_NOT_CACHED,
-    PATTERN_ENTRY_USED,
-    PATTERN_ENTRY_VALIDATED,
-    PATTERN_ENTRY_UPDATED,
-    PATTERN_ENTRY_CANT_CONDITIONALIZE,
-    PATTERN_MAX,
-  };
-
   // Used for categorizing validation triggers in histograms.
   // NOTE: This enumeration is used in histograms, so please do not add entries
   // in the middle.
   enum ValidationCause {
     VALIDATION_CAUSE_UNDEFINED,
     VALIDATION_CAUSE_VARY_MISMATCH,
     VALIDATION_CAUSE_VALIDATE_FLAG,
     VALIDATION_CAUSE_STALE,
     VALIDATION_CAUSE_ZERO_FRESHNESS,
     VALIDATION_CAUSE_MAX
@@ skipping 161 matching lines @@
   int DoRestartPartialRequest();
 
   // Resets the relavant internal state to remove traces of internal processing
   // related to range requests. Deletes |partial_| if |delete_object| is true.
   void ResetPartialState(bool delete_object);
 
   // Resets |network_trans_|, which must be non-NULL.  Also updates
   // |old_network_trans_load_timing_|, which must be NULL when this is called.
   void ResetNetworkTransaction();
 
-  // Returns true if we should bother attempting to resume this request if it
-  // is aborted while in progress. If |has_data| is true, the size of the stored
+  // Returns true if we should bother attempting to resume this request if it is
+  // aborted while in progress. If |has_data| is true, the size of the stored
   // data is considered for the result.
   bool CanResume(bool has_data);
 
-  void UpdateTransactionPattern(TransactionPattern new_transaction_pattern);
+  // Setter for response_ and auth_response_. It updates its cache entry status,
+  // if needed.
+  void SetResponse(const HttpResponseInfo& new_response);
+  void SetAuthResponse(const HttpResponseInfo& new_response);
+
+  void UpdateCacheEntryStatus(
+      HttpResponseInfo::CacheEntryStatus new_cache_entry_status);
+
+  // Sets the response.cache_entry_status to the current cache_entry_status_.
+  void SyncCacheEntryStatusToResponse();
   void RecordHistograms();
 
   // Called to signal completion of asynchronous IO.
   void OnIOComplete(int result);
 
   State next_state_;
   const HttpRequestInfo* request_;
   RequestPriority priority_;
   BoundNetLog net_log_;
   std::unique_ptr<HttpRequestInfo> custom_request_;
@@ skipping 26 matching lines @@
   scoped_refptr<IOBuffer> read_buf_;
   int io_buf_len_;
   int read_offset_;
   int effective_load_flags_;
   int write_len_;
   std::unique_ptr<PartialData> partial_;  // We are dealing with range requests.
   UploadProgress final_upload_progress_;
   CompletionCallback io_callback_;
 
   // Members used to track data for histograms.
-  TransactionPattern transaction_pattern_;
+  // This cache_entry_status_ takes precedence over
+  // response_.cache_entry_status. In fact, response_.cache_entry_status must be
+  // kept in sync with cache_entry_status_ (via SetResponse and
+  // UpdateCacheEntryStatus).
+  HttpResponseInfo::CacheEntryStatus cache_entry_status_;
   ValidationCause validation_cause_;
   base::TimeTicks entry_lock_waiting_since_;
   base::TimeTicks first_cache_access_since_;
   base::TimeTicks send_request_since_;
   base::Time open_entry_last_used_;
   base::TimeDelta stale_entry_freshness_;
   base::TimeDelta stale_entry_age_;
 
   int64_t total_received_bytes_;
   int64_t total_sent_bytes_;
@@ skipping 17 matching lines @@
   BeforeHeadersSentCallback before_headers_sent_callback_;
 
   base::WeakPtrFactory<Transaction> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Transaction);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_CACHE_TRANSACTION_H_