page cycler: Use buffer-cache priming code on all systems.

base/file_util.cc

 // Copyright (c) 2006-2009 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.
 
 #include "base/file_util.h"
 
 #if defined(OS_WIN)
 #include <io.h>
 #endif
 #include <stdio.h>
@@ skipping 168 matching lines @@
 
 bool ReadFileToString(const FilePath& path, std::string* contents) {
   FILE* file = OpenFile(path, "rb");
   if (!file) {
     return false;
   }
 
   char buf[1 << 16];
   size_t len;
   while ((len = fread(buf, 1, sizeof(buf), file)) > 0) {
-    contents->append(buf, len);
+    if (contents)

[jorlow, 2010/05/19 10:41:50]

This feels dirty to me.  I understand what you're doing here and that you don't
want to copy/paste code.  I understand that there's almost no chance of this
having a performance impact even though it's inside the loop.  And so on.  But
it just feels a bit dirty.

[Mark Mentovai, 2010/05/19 14:00:27]

This does not feel dirty to me at all.

+      contents->append(buf, len);
   }
   CloseFile(file);
 
   return true;
 }
 
 FILE* CreateAndOpenTemporaryFile(FilePath* path) {
   FilePath directory;
   if (!GetTempDir(&directory))
     return false;
@@ skipping 222 matching lines @@
 // FileEnumerator
 //
 // Note: the main logic is in file_util_<platform>.cc
 
 bool FileEnumerator::ShouldSkip(const FilePath& path) {
   FilePath::StringType basename = path.BaseName().value();
   return IsDot(path) || (IsDotDot(path) && !(INCLUDE_DOT_DOT & file_type_));
 }
 
 }  // namespace