Files.app: Fix a bug in content hash computation.

chrome/browser/drive/drive_api_util.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.
 
 #ifndef CHROME_BROWSER_DRIVE_DRIVE_API_UTIL_H_
 #define CHROME_BROWSER_DRIVE_DRIVE_API_UTIL_H_
 
 #include <string>
 
 #include "base/md5.h"
@@ skipping 74 matching lines @@
   // Computes an MD5 digest of data read from the given |streamReader|.  The
   // work occurs asynchronously, and the resulting hash is returned via the
   // |callback|.  If an error occurs, |callback| is called with an empty string.
   // Only one stream can be processed at a time by each digester.  Do not call
   // GetMd5Digest before the results of a previous call have been returned.
   void GetMd5Digest(scoped_ptr<storage::FileStreamReader> stream_reader,
                     const ResultCallback& callback);
 
  private:
   // Kicks off a read of the next chunk from the stream.
-  void ReadNextChunk();
+  void ReadNextChunk(const ResultCallback& callback);
   // Handles the incoming chunk of data from a stream read.
-  void OnChunkRead(int result);
+  void OnChunkRead(const ResultCallback& callback, int bytesRead);

[mtomasz, 2015/02/25 05:02:00]

nit: bytes_read

[Ben Kwa, 2015/02/25 05:07:07]

Gah, missed the header. Done.

 
   // Maximum chunk size for read operations.
   scoped_ptr<storage::FileStreamReader> reader_;
-  ResultCallback callback_;
   scoped_refptr<net::IOBuffer> buffer_;
   base::MD5Context md5_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FileStreamMd5Digester);
 };
 
 // Returns preferred file extension for hosted documents which have given mime
 // type.
 std::string GetHostedDocumentExtension(const std::string& mime_type);
 
 // Returns true if the given mime type is corresponding to one of known hosted
 // document types.
 bool IsKnownHostedDocumentMimeType(const std::string& mime_type);
 
 // Returns true if the given file path has an extension corresponding to one of
 // hosted document types.
 bool HasHostedDocumentExtension(const base::FilePath& path);
 
 }  // namespace util
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_DRIVE_DRIVE_API_UTIL_H_