Index: chrome/browser/themes/browser_theme_pack.cc |
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc |
index 3f2837e8988911c7efee1b58bf0d6f8d27a56a43..55587a9e038e48fed8c918e9cd88ac8bb9e83817 100644 |
--- a/chrome/browser/themes/browser_theme_pack.cc |
+++ b/chrome/browser/themes/browser_theme_pack.cc |
@@ -389,7 +389,7 @@ bool HasFrameBorder() { |
} |
// Returns a piece of memory with the contents of the file |path|. |
-base::RefCountedMemory* ReadFileData(const base::FilePath& path) { |
+scoped_refptr<base::RefCountedMemory> ReadFileData(const base::FilePath& path) { |
if (!path.empty()) { |
base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ); |
if (file.IsValid()) { |
@@ -405,7 +405,7 @@ base::RefCountedMemory* ReadFileData(const base::FilePath& path) { |
} |
} |
- return NULL; |
+ return nullptr; |
} |
// Shifts an image's HSL values. The caller is responsible for deleting |