Merge Chromium at r11.0.696.0: Initial merge by git

Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d

1 files changed, 12 insertions, 3 deletions

diff --git a/net/disk_cache/entry_impl.h b/net/disk_cache/entry_impl.h
index e56fc6b..99e7b4e 100644
--- a/net/disk_cache/entry_impl.h
+++ b/net/disk_cache/entry_impl.h
@@ -87,9 +87,17 @@ class EntryImpl : public Entry, public base::RefCounted<EntryImpl> {
   // is to be able to detect entries that are currently in use.
   bool Update();
 
-  // Returns true if this entry is marked as dirty on disk.
-  bool IsDirty(int32 current_id);
-  void ClearDirtyFlag();
+  bool dirty() {
+    return dirty_;
+  }
+
+  bool doomed() {
+    return doomed_;
+  }
+
+  // Marks this entry as dirty (in memory) if needed. This is intended only for
+  // entries that are being read from disk, to be called during loading.
+  void SetDirtyFlag(int32 current_id);
 
   // Fixes this entry so it can be treated as valid (to delete it).
   void SetPointerForInvalidEntry(int32 new_id);
@@ -234,6 +242,7 @@ class EntryImpl : public Entry, public base::RefCounted<EntryImpl> {
   int unreported_size_[kNumStreams];  // Bytes not reported yet to the backend.
   bool doomed_;               // True if this entry was removed from the cache.
   bool read_only_;            // True if not yet writing.
+  bool dirty_;                // True if we detected that this is a dirty entry.
   scoped_ptr<SparseControl> sparse_;  // Support for sparse entries.
 
   net::BoundNetLog net_log_;