Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 31 insertions, 2 deletions

diff --git a/chromium/net/disk_cache/simple/simple_entry_impl.h b/chromium/net/disk_cache/simple/simple_entry_impl.h
index e2f0c63b39e..2d78d8bfe0a 100644
--- a/chromium/net/disk_cache/simple/simple_entry_impl.h
+++ b/chromium/net/disk_cache/simple/simple_entry_impl.h
@@ -188,6 +188,21 @@ class NET_EXPORT_PRIVATE SimpleEntryImpl : public Entry,
                          const CompletionCallback& callback,
                          bool truncate);
 
+  void ReadSparseDataInternal(int64 sparse_offset,
+                              net::IOBuffer* buf,
+                              int buf_len,
+                              const CompletionCallback& callback);
+
+  void WriteSparseDataInternal(int64 sparse_offset,
+                               net::IOBuffer* buf,
+                               int buf_len,
+                               const CompletionCallback& callback);
+
+  void GetAvailableRangeInternal(int64 sparse_offset,
+                                 int len,
+                                 int64* out_start,
+                                 const CompletionCallback& callback);
+
   void DoomEntryInternal(const CompletionCallback& callback);
 
   // Called after a SimpleSynchronousEntry has completed CreateEntry() or
@@ -208,8 +223,7 @@ class NET_EXPORT_PRIVATE SimpleEntryImpl : public Entry,
 
   // Internal utility method used by other completion methods. Calls
   // |completion_callback| after updating state and dooming on errors.
-  void EntryOperationComplete(int stream_index,
-                              const CompletionCallback& completion_callback,
+  void EntryOperationComplete(const CompletionCallback& completion_callback,
                               const SimpleEntryStat& entry_stat,
                               scoped_ptr<int> result);
 
@@ -227,6 +241,20 @@ class NET_EXPORT_PRIVATE SimpleEntryImpl : public Entry,
                               scoped_ptr<SimpleEntryStat> entry_stat,
                               scoped_ptr<int> result);
 
+  void ReadSparseOperationComplete(
+      const CompletionCallback& completion_callback,
+      scoped_ptr<base::Time> last_used,
+      scoped_ptr<int> result);
+
+  void WriteSparseOperationComplete(
+      const CompletionCallback& completion_callback,
+      scoped_ptr<SimpleEntryStat> entry_stat,
+      scoped_ptr<int> result);
+
+  void GetAvailableRangeOperationComplete(
+      const CompletionCallback& completion_callback,
+      scoped_ptr<int> result);
+
   // Called after an asynchronous doom completes.
   void DoomOperationComplete(const CompletionCallback& callback,
                              State state_to_restore,
@@ -287,6 +315,7 @@ class NET_EXPORT_PRIVATE SimpleEntryImpl : public Entry,
   base::Time last_used_;
   base::Time last_modified_;
   int32 data_size_[kSimpleEntryStreamCount];
+  int32 sparse_data_size_;
 
   // Number of times this object has been returned from Backend::OpenEntry() and
   // Backend::CreateEntry() without subsequent Entry::Close() calls. Used to