diff options
Diffstat (limited to 'webkit/fileapi')
| -rw-r--r-- | webkit/fileapi/file_system_directory_database.cc | 2 | ||||
| -rw-r--r-- | webkit/fileapi/file_system_usage_cache.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc index 88152e2..217b98f 100644 --- a/webkit/fileapi/file_system_directory_database.cc +++ b/webkit/fileapi/file_system_directory_database.cc @@ -47,7 +47,7 @@ bool PickleFromFileInfo( bool FileInfoFromPickle( const Pickle& pickle, fileapi::FileSystemDirectoryDatabase::FileInfo* info) { - void* iter = NULL; + PickleIterator iter(pickle); std::string data_path; std::string name; int64 internal_time; diff --git a/webkit/fileapi/file_system_usage_cache.cc b/webkit/fileapi/file_system_usage_cache.cc index 46bbdff..18d13c7 100644 --- a/webkit/fileapi/file_system_usage_cache.cc +++ b/webkit/fileapi/file_system_usage_cache.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -131,7 +131,7 @@ int64 FileSystemUsageCache::Read(const FilePath& usage_file_path, file_util::ReadFile(usage_file_path, buffer, kUsageFileSize)) return -1; Pickle read_pickle(buffer, kUsageFileSize); - void* iter = NULL; + PickleIterator iter(read_pickle); int64 fs_usage; if (!read_pickle.ReadBytes(&iter, &header, kUsageFileHeaderSize) || |