diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 02:48:09 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 02:48:09 +0000 |
| commit | c40df01c49515eea3e9ee37bc82b644c778ee25e (patch) | |
| tree | 1d66136b5197426eadbad0f8389952f5798fa463 /chrome/browser/media_galleries | |
| parent | 0ddde4beee7380871705af7dcca75f8eabbe664f (diff) | |
| download | chromium_src-c40df01c49515eea3e9ee37bc82b644c778ee25e.zip chromium_src-c40df01c49515eea3e9ee37bc82b644c778ee25e.tar.gz chromium_src-c40df01c49515eea3e9ee37bc82b644c778ee25e.tar.bz2 | |
Cleanup: Remove ScopedGenericObj usage in chrome/.
Review URL: https://chromiumcodereview.appspot.com/16041004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media_galleries')
| -rw-r--r-- | chrome/browser/media_galleries/fileapi/native_media_file_util.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc index 3c1c4c1..0239a6c 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc @@ -5,7 +5,6 @@ #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h" #include "base/file_util.h" -#include "base/memory/scoped_generic_obj.h" #include "base/string_util.h" #include "chrome/browser/media_galleries/fileapi/filtering_file_enumerator.h" #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h" @@ -29,16 +28,15 @@ namespace chrome { namespace { // Modelled after ScopedFILEClose. -class ScopedPlatformFileClose { - public: - void operator()(base::PlatformFile file) const { - if (file != base::kInvalidPlatformFileValue) - base::ClosePlatformFile(file); +struct ScopedPlatformFileClose { + void operator()(base::PlatformFile* file) { + if (file && *file != base::kInvalidPlatformFileValue) + base::ClosePlatformFile(*file); } }; -typedef ScopedGenericObj<base::PlatformFile, - ScopedPlatformFileClose> ScopedPlatformFile; +typedef scoped_ptr<base::PlatformFile, ScopedPlatformFileClose> + ScopedPlatformFile; // Returns true if the current thread is capable of doing IO. bool IsOnTaskRunnerThread(fileapi::FileSystemOperationContext* context) { @@ -279,7 +277,7 @@ base::PlatformFileError NativeMediaFileUtil::IsMediaFile( if (error != base::PLATFORM_FILE_OK) return error; - ScopedPlatformFile scoped_platform_file(file_handle); + ScopedPlatformFile scoped_platform_file(&file_handle); char buffer[net::kMaxBytesToSniff]; // Read as much as net::SniffMimeTypeFromLocalData() will bother looking at. |