Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Unified Diff: storage/browser/fileapi/file_system_usage_cache.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/skia_utils_base.cc ('k') | storage/browser/fileapi/sandbox_directory_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: storage/browser/fileapi/file_system_usage_cache.cc
diff --git a/storage/browser/fileapi/file_system_usage_cache.cc b/storage/browser/fileapi/file_system_usage_cache.cc
index 8c651776aba4fa97a951042c1ab19088f299d28b..f1d3ece46011eb3489a079add1058896a40bfc57 100644
--- a/storage/browser/fileapi/file_system_usage_cache.cc
+++ b/storage/browser/fileapi/file_system_usage_cache.cc
@@ -38,8 +38,7 @@ const int FileSystemUsageCache::kUsageFileHeaderSize = 4;
// Pickle::{Read,Write}Bool treat bool as int
const int FileSystemUsageCache::kUsageFileSize =
- sizeof(Pickle::Header) +
- FileSystemUsageCache::kUsageFileHeaderSize +
+ sizeof(base::Pickle::Header) + FileSystemUsageCache::kUsageFileHeaderSize +
sizeof(int) + sizeof(int32) + sizeof(int64); // NOLINT
bool FileSystemUsageCache::GetUsage(const base::FilePath& usage_file_path,
@@ -176,8 +175,8 @@ bool FileSystemUsageCache::Read(const base::FilePath& usage_file_path,
if (usage_file_path.empty() ||
!ReadBytes(usage_file_path, buffer, kUsageFileSize))
return false;
- Pickle read_pickle(buffer, kUsageFileSize);
- PickleIterator iter(read_pickle);
+ base::Pickle read_pickle(buffer, kUsageFileSize);
+ base::PickleIterator iter(read_pickle);
uint32 dirty = 0;
int64 usage = 0;
@@ -204,7 +203,7 @@ bool FileSystemUsageCache::Write(const base::FilePath& usage_file_path,
int64 usage) {
TRACE_EVENT0("FileSystem", "UsageCache::Write");
DCHECK(CalledOnValidThread());
- Pickle write_pickle;
+ base::Pickle write_pickle;
write_pickle.WriteBytes(kUsageFileHeader, kUsageFileHeaderSize);
write_pickle.WriteBool(is_valid);
write_pickle.WriteUInt32(dirty);
« no previous file with comments | « skia/ext/skia_utils_base.cc ('k') | storage/browser/fileapi/sandbox_directory_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698