Reland "Fix sandbox::PolicyBase leak"

sandbox/win/tests/common/controller.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 "sandbox/win/tests/common/controller.h"
 
 #include <string>
 
 #include "base/memory/shared_memory.h"
 #include "base/process/process.h"
@@ skipping 118 matching lines @@
   if (!policy_)
     return;
 
   policy_->SetJobLevel(job_level, 0);
   policy_->SetTokenLevel(startup_token, main_token);
 
   is_init_ = true;
 }
 
 TargetPolicy* TestRunner::GetPolicy() {
-  return policy_;
+  return policy_.get();
 }
 
 TestRunner::~TestRunner() {
   if (target_process_.IsValid() && kill_on_destruction_)
     ::TerminateProcess(target_process_.Get(), 0);
-
-  if (policy_)
-    policy_->Release();
 }
 
 bool TestRunner::AddRule(TargetPolicy::SubSystem subsystem,
                          TargetPolicy::Semantics semantics,
                          const wchar_t* pattern) {
   if (!is_init_)
     return false;
 
   return (SBOX_ALL_OK == policy_->AddRule(subsystem, semantics, pattern));
 }
@@ skipping 77 matching lines @@
   if (no_sandbox_) {
     STARTUPINFO startup_info = {sizeof(STARTUPINFO)};
     if (!::CreateProcessW(prog_name, &arguments[0], NULL, NULL, FALSE, 0,
                           NULL, NULL, &startup_info, &target)) {
       return SBOX_ERROR_GENERIC;
     }
   } else {
     result = broker_->SpawnTarget(prog_name, arguments.c_str(), policy_,
                                   &warning_result, &last_error, &target);
   }
-  if (release_policy_in_run_) {
-    policy_->Release();
+  if (release_policy_in_run_)
     policy_ = nullptr;
-  }
 
   if (SBOX_ALL_OK != result)
     return SBOX_TEST_FAILED_TO_RUN_TEST;
 
   ::ResumeThread(target.hThread);
 
   // For an asynchronous run we don't bother waiting.
   if (is_async_) {
     target_process_.Set(target.hProcess);
     target_process_id_ = target.dwProcessId;
@@ skipping 113 matching lines @@
 
     target->LowerToken();
   } else if (0 != _wcsicmp(argv[1], L"-child-no-sandbox")) {
     return SBOX_TEST_FAILED_TO_EXECUTE_COMMAND;
   }
 
   return command(argc - 4, argv + 4);
 }
 
 }  // namespace sandbox