Reland "Fix sandbox::PolicyBase leak"

sandbox/win/src/broker_services.h

 // 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.
 
 #ifndef SANDBOX_WIN_SRC_BROKER_SERVICES_H_
 #define SANDBOX_WIN_SRC_BROKER_SERVICES_H_
 
 #include <list>
 #include <map>
 #include <memory>
@@ skipping 27 matching lines @@
 // collection of the former.
 class BrokerServicesBase final : public BrokerServices,
                                  public SingletonBase<BrokerServicesBase> {
  public:
   BrokerServicesBase();
 
   ~BrokerServicesBase();
 
   // BrokerServices interface.
   ResultCode Init() override;
-  TargetPolicy* CreatePolicy() override;
+  scoped_refptr<TargetPolicy> CreatePolicy() override;
   ResultCode SpawnTarget(const wchar_t* exe_path,
                          const wchar_t* command_line,
-                         TargetPolicy* policy,
+                         scoped_refptr<TargetPolicy> policy,
                          ResultCode* last_warning,
                          DWORD* last_error,
                          PROCESS_INFORMATION* target) override;
   ResultCode WaitForAllTargets() override;
 
   // Checks if the supplied process ID matches one of the broker's active
   // target processes
   // Returns:
   //   true if there is an active target process for this ID, otherwise false.
   bool IsActiveTarget(DWORD process_id);
@@ skipping 29 matching lines @@
   // jobs.
   std::set<DWORD> child_process_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(BrokerServicesBase);
 };
 
 }  // namespace sandbox
 
 
 #endif  // SANDBOX_WIN_SRC_BROKER_SERVICES_H_