Cleanup: Remove ScopedGenericObj usage in chrome/.

chrome/browser/media_galleries/fileapi/native_media_file_util.cc

 // Copyright (c) 2012 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 "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"
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_sniffer.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_task_runners.h"
 #include "webkit/browser/fileapi/native_file_util.h"
 
 using base::PlatformFile;
 using base::PlatformFileError;
 using base::PlatformFileInfo;
 using fileapi::FileSystemOperationContext;
 using fileapi::FileSystemURL;
 using fileapi::NativeFileUtil;
 
 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) {
   return context->file_system_context()->task_runners()->
       media_task_runner()->RunsTasksOnCurrentThread();
 }
 
 MediaPathFilter* GetMediaPathFilter(FileSystemOperationContext* context) {
   return context->GetUserValue<MediaPathFilter*>(
           MediaFileSystemMountPointProvider::kMediaPathFilterKey);
@@ skipping 220 matching lines @@
 // static
 base::PlatformFileError NativeMediaFileUtil::IsMediaFile(
     const base::FilePath& path) {
   base::PlatformFile file_handle;
   const int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
   base::PlatformFileError error =
       NativeFileUtil::CreateOrOpen(path, flags, &file_handle, NULL);
   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.
   int64 len =
       base::ReadPlatformFile(file_handle, 0, buffer, net::kMaxBytesToSniff);
   if (len < 0)
     return base::PLATFORM_FILE_ERROR_FAILED;
   if (len == 0)
     return base::PLATFORM_FILE_ERROR_SECURITY;
 
   std::string mime_type;
   if (!net::SniffMimeTypeFromLocalData(buffer, len, &mime_type))
     return base::PLATFORM_FILE_ERROR_SECURITY;
 
   if (StartsWithASCII(mime_type, "image/", true) ||
       StartsWithASCII(mime_type, "audio/", true) ||
       StartsWithASCII(mime_type, "video/", true) ||
       mime_type == "application/x-shockwave-flash") {
     return base::PLATFORM_FILE_OK;
   }
   return base::PLATFORM_FILE_ERROR_SECURITY;
 }
 
 }  // namespace chrome