Revert 152049 - Fix memory leaks in extensions::SocketPermission.

chrome/common/extensions/permissions/socket_permission.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/common/extensions/permissions/socket_permission.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 72 matching lines @@
 APIPermissionDetail* SocketPermission::Clone() const {
   SocketPermission* result = new SocketPermission(permission());
   result->data_set_ = data_set_;
   return result;
 }
 
 APIPermissionDetail* SocketPermission::Diff(
     const APIPermissionDetail* rhs) const {
   CHECK(rhs->permission() == permission());
   const SocketPermission* perm = static_cast<const SocketPermission*>(rhs);
-  SocketPermission* result = new SocketPermission(permission());
+  scoped_refptr<SocketPermission> result = new SocketPermission(permission());
   std::set_difference(data_set_.begin(), data_set_.end(),
                       perm->data_set_.begin(), perm->data_set_.end(),
                       std::inserter<std::set<SocketPermissionData> >(
                           result->data_set_, result->data_set_.begin()));
-  if (result->data_set_.empty()) {
-    delete result;
-    result = NULL;
-  }
-  return result;
-
+  return result->data_set_.empty() ? NULL : result.release();
 }
 
 APIPermissionDetail* SocketPermission::Union(
     const APIPermissionDetail* rhs) const {
   CHECK(rhs->permission() == permission());
   const SocketPermission* perm = static_cast<const SocketPermission*>(rhs);
-  SocketPermission* result = new SocketPermission(permission());
+  scoped_refptr<SocketPermission> result = new SocketPermission(permission());
   std::set_union(data_set_.begin(), data_set_.end(),
                  perm->data_set_.begin(), perm->data_set_.end(),
                  std::inserter<std::set<SocketPermissionData> >(
                      result->data_set_, result->data_set_.begin()));
-  if (result->data_set_.empty()) {
-    delete result;
-    result = NULL;
-  }
-  return result;
-
+  return result->data_set_.empty() ? NULL : result.release();
 }
 
 APIPermissionDetail* SocketPermission::Intersect(
     const APIPermissionDetail* rhs) const {
   CHECK(rhs->permission() == permission());
   const SocketPermission* perm = static_cast<const SocketPermission*>(rhs);
-  SocketPermission* result = new SocketPermission(permission());
+  scoped_refptr<SocketPermission> result = new SocketPermission(permission());
   std::set_intersection(data_set_.begin(), data_set_.end(),
                         perm->data_set_.begin(), perm->data_set_.end(),
                         std::inserter<std::set<SocketPermissionData> >(
                             result->data_set_, result->data_set_.begin()));
-  if (result->data_set_.empty()) {
-    delete result;
-    result = NULL;
-  }
-  return result;
+  return result->data_set_.empty() ? NULL : result.release();
 }
 
 void SocketPermission::Write(IPC::Message* m) const {
   IPC::WriteParam(m, data_set_);
 }
 
 bool SocketPermission::Read(const IPC::Message* m, PickleIterator* iter) {
   return IPC::ReadParam(m, iter, &data_set_);
 }
 
 void SocketPermission::Log(std::string* log) const {
   IPC::LogParam(data_set_, log);
 }
 
 }  // namespace extensions