Convert scoped_ptr_malloc -> scoped_ptr, part 1.

chrome/browser/chromeos/system/timezone_util.cc

 // Copyright 2013 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/chromeos/system/timezone_util.h"
 
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 40 matching lines @@
       zone_strings = ures_getByKey(zone_bundle, "zone_strings", NULL, &status);
   }
 
   icu::UnicodeString zone_id;
   zone.getID(zone_id);
   std::string zone_id_str;
   zone_id.toUTF8String(zone_id_str);
 
   // Resource keys for timezones use ':' in place of '/'.
   ReplaceSubstringsAfterOffset(&zone_id_str, 0, "/", ":");
-  scoped_ptr_malloc<UResourceBundle, UResClose> zone_item(
+  scoped_ptr<UResourceBundle, UResClose> zone_item(
       ures_getByKey(zone_strings, zone_id_str.c_str(), NULL, &status));
   icu::UnicodeString city;
   if (!U_FAILURE(status)) {
     city = icu::ures_getUnicodeStringByKey(zone_item.get(), "ec", &status);
     if (U_SUCCESS(status))
       return base::string16(city.getBuffer(), city.length());
   }
 
   // Fallback case in case of failure.
   ReplaceSubstringsAfterOffset(&zone_id_str, 0, ":", "/");
@@ skipping 66 matching lines @@
     option->Append(new base::StringValue(
         chromeos::system::TimezoneSettings::GetTimezoneID(*timezone)));
     option->Append(new base::StringValue(GetTimezoneName(*timezone)));
     timezoneList->Append(option);
   }
   return timezoneList.Pass();
 }
 
 }  // namespace system
 }  // namespace chromeos