diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 12:46:38 +0000 |
commit | f0a51fb571f46531025fa09240bbc3e1af925e84 (patch) | |
tree | 558b4f0e737fda4b9ab60f252c9c23b8a4ca523e /net/disk_cache | |
parent | 6390be368205705f49ead3cec40396519f13b889 (diff) | |
download | chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.zip chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.gz chromium_src-f0a51fb571f46531025fa09240bbc3e1af925e84.tar.bz2 |
Fixes CRLF and trailing white spaces.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/disk_cache')
-rw-r--r-- | net/disk_cache/disk_cache_perftest.cc | 2 | ||||
-rw-r--r-- | net/disk_cache/disk_cache_test_util.cc | 4 | ||||
-rw-r--r-- | net/disk_cache/entry_unittest.cc | 2 | ||||
-rw-r--r-- | net/disk_cache/file.h | 2 | ||||
-rw-r--r-- | net/disk_cache/stress_cache.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc index 74cac65..785f93f 100644 --- a/net/disk_cache/disk_cache_perftest.cc +++ b/net/disk_cache/disk_cache_perftest.cc @@ -222,7 +222,7 @@ TEST_F(DiskCacheTest, BlockFilesPerformance) { memset(buffer, 0, sizeof(buffer)); disk_cache::Addr* address = reinterpret_cast<disk_cache::Addr*>(buffer); ASSERT_EQ(sizeof(*address), sizeof(*buffer)); - + PerfTimeLogger timer1("Fill three block-files"); // Fill up the 32-byte block file (use three files). diff --git a/net/disk_cache/disk_cache_test_util.cc b/net/disk_cache/disk_cache_test_util.cc index 4920e54..9a15209 100644 --- a/net/disk_cache/disk_cache_test_util.cc +++ b/net/disk_cache/disk_cache_test_util.cc @@ -50,8 +50,8 @@ std::wstring GetCachePath() { bool CreateCacheTestFile(const wchar_t* name) { using namespace disk_cache; - int flags = base::PLATFORM_FILE_CREATE_ALWAYS | - base::PLATFORM_FILE_READ | + int flags = base::PLATFORM_FILE_CREATE_ALWAYS | + base::PLATFORM_FILE_READ | base::PLATFORM_FILE_WRITE; scoped_refptr<File> file(new File( diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index bb7cc2e..a79b3f7 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc @@ -607,7 +607,7 @@ void DiskCacheEntryTest::ZeroLengthIO() { std::string key1("the first key"); disk_cache::Entry *entry1; ASSERT_TRUE(cache_->CreateEntry(key1, &entry1)); - + EXPECT_EQ(0, entry1->ReadData(0, 0, NULL, 0, NULL)); EXPECT_EQ(0, entry1->WriteData(0, 0, NULL, 0, NULL, false)); diff --git a/net/disk_cache/file.h b/net/disk_cache/file.h index b457e88..53c72bd 100644 --- a/net/disk_cache/file.h +++ b/net/disk_cache/file.h @@ -20,7 +20,7 @@ class FileIOCallback { // Notified of the actual number of bytes read or written. This value is // negative if an error occurred. virtual void OnFileIOComplete(int bytes_copied) = 0; - + virtual ~FileIOCallback() {} }; diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc index e35a195..4c19cd8 100644 --- a/net/disk_cache/stress_cache.cc +++ b/net/disk_cache/stress_cache.cc @@ -179,7 +179,7 @@ void CrashHandler(const std::string& str) { int main(int argc, const char* argv[]) { // Setup an AtExitManager so Singleton objects will be destructed. - base::AtExitManager at_exit_manager; + base::AtExitManager at_exit_manager; if (argc < 2) return MasterCode(); |