Sandbox: Remove ::CloseHandle from BrokerServices.

sandbox/win/src/broker_services.h

Index: sandbox/win/src/broker_services.h
diff --git a/sandbox/win/src/broker_services.h b/sandbox/win/src/broker_services.h
index 3e7a1790ee66ecc0fa9478f03c6a685f97fd4439..3f269ef6986a5e8f15fbfc273777138638bfcdbc 100644
--- a/sandbox/win/src/broker_services.h
+++ b/sandbox/win/src/broker_services.h
@@ -64,9 +64,10 @@ class BrokerServicesBase final : public BrokerServices,
   bool IsActiveTarget(DWORD process_id);
 
  private:
-  // Releases the Job and notifies the associated Policy object to its
-  // resources as well.
-  static void FreeResources(JobTracker* tracker);
+  struct TokenPair;
+  typedef std::list<JobTracker*> JobTrackerList;
+  typedef std::map<DWORD, PeerTracker*> PeerTrackerMap;
+  typedef std::map<uint32_t, TokenPair*> TokenCacheMap;
 
   // The routine that the worker thread executes. It is in charge of
   // notifications and cleanup-related tasks.
@@ -77,14 +78,14 @@ class BrokerServicesBase final : public BrokerServices,
 
   // The completion port used by the job objects to communicate events to
   // the worker thread.
-  HANDLE job_port_;
+  base::win::ScopedHandle job_port_;
 
   // Handle to a manual-reset event that is signaled when the total target
   // process count reaches zero.
-  HANDLE no_targets_;
+  base::win::ScopedHandle no_targets_;
 
   // Handle to the worker thread that reacts to job notifications.
-  HANDLE job_thread_;
+  base::win::ScopedHandle job_thread_;
 
   // Lock used to protect the list of targets from being modified by 2
   // threads at the same time.
@@ -94,19 +95,16 @@ class BrokerServicesBase final : public BrokerServices,
   ThreadProvider* thread_pool_;
 
   // List of the trackers for closing and cleanup purposes.
-  typedef std::list<JobTracker*> JobTrackerList;
   JobTrackerList tracker_list_;
 
   // Maps peer process IDs to the saved handle and wait event.
   // Prevents peer callbacks from accessing the broker after destruction.
-  typedef std::map<DWORD, PeerTracker*> PeerTrackerMap;
   PeerTrackerMap peer_map_;
 
   // Provides a fast lookup to identify sandboxed processes that belong to a
   // job. Consult |jobless_process_handles_| for handles of pocess without job.
   std::set<DWORD> child_process_ids_;
 
-  typedef std::map<uint32_t, std::pair<HANDLE, HANDLE>> TokenCacheMap;
   TokenCacheMap token_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(BrokerServicesBase);