Cleanup: Remove ScopedGenericObj. Use scoped_ptr<type, CustomDeleter> instead.

base/mac/mac_util.mm

 // 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 "base/mac/mac_util.h"
 
 #import <Cocoa/Cocoa.h>
 #import <IOKit/IOKitLib.h>
 
 #include <errno.h>
 #include <string.h>
 #include <sys/utsname.h>
 #include <sys/xattr.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_generic_obj.h"
+#include "base/mac/scoped_ioobject.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
 
 namespace base {
 namespace mac {
 
 // Replicate specific 10.7 SDK declarations for building with prior SDKs.
 #if !defined(MAC_OS_X_VERSION_10_7) || \
@@ skipping 608 matching lines @@
   return MacOSXMinorVersion() >= MOUNTAIN_LION_MINOR_VERSION;
 }
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8)
 bool IsOSLaterThanMountainLion_DontCallThis() {
   return MacOSXMinorVersion() > MOUNTAIN_LION_MINOR_VERSION;
 }
 #endif
 
-namespace {
-
-// ScopedGenericObj functor for IOObjectRelease().
-class ScopedReleaseIOObject {
- public:
-  void operator()(io_object_t x) const {
-    IOObjectRelease(x);
-  }
-};
-
-}  // namespace
-
 std::string GetModelIdentifier() {
-  ScopedGenericObj<io_service_t, ScopedReleaseIOObject>
-      platform_expert(IOServiceGetMatchingService(
-          kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice")));
+  std::string return_string;
+  ScopedIOObject<io_service_t> platform_expert(
+      IOServiceGetMatchingService(kIOMasterPortDefault,
+                                  IOServiceMatching("IOPlatformExpertDevice")));
   if (!platform_expert)
-    return "";
+    return return_string;

[Mark Mentovai, 2013/05/28 20:52:18]

Since you’ve rewritten this function to always return return_string, I’d flip
the condition around and give it only one return point at the bottom.

  if (platform_expert) {
    // do stuff, maybe set return_string
  }
  return return_string;

[Lei Zhang, 2013/05/28 21:01:18]

Done.

   ScopedCFTypeRef<CFDataRef> model_data(
       static_cast<CFDataRef>(IORegistryEntryCreateCFProperty(
           platform_expert,
           CFSTR("model"),
           kCFAllocatorDefault,
           0)));
-  if (!model_data)
-    return "";
-  return reinterpret_cast<const char*>(
-      CFDataGetBytePtr(model_data));
+  if (model_data)
+    return_string = reinterpret_cast<const char*>(CFDataGetBytePtr(model_data));
+  return return_string;
 }
 
 bool ParseModelIdentifier(const std::string& ident,
                           std::string* type,
                           int32* major,
                           int32* minor) {
   size_t number_loc = ident.find_first_of("0123456789");
   if (number_loc == std::string::npos)
     return false;
   size_t comma_loc = ident.find(',', number_loc);
   if (comma_loc == std::string::npos)
     return false;
   int32 major_tmp, minor_tmp;
   std::string::const_iterator begin = ident.begin();
   if (!StringToInt(
           StringPiece(begin + number_loc, begin + comma_loc), &major_tmp) ||
       !StringToInt(
           StringPiece(begin + comma_loc + 1, ident.end()), &minor_tmp))
     return false;
   *type = ident.substr(0, number_loc);
   *major = major_tmp;
   *minor = minor_tmp;
   return true;
 }
 
 }  // namespace mac
 }  // namespace base