Unify PolicyBase into TargetPolicy.

content/common/sandbox_win.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 "content/common/sandbox_win.h"
 
 #include <string>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 17 matching lines @@
 #include "base/win/windows_version.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/dwrite_font_platform_win.h"
 #include "content/public/common/sandbox_init.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
 #include "sandbox/win/src/process_mitigations.h"
 #include "sandbox/win/src/sandbox.h"
 #include "sandbox/win/src/sandbox_nt_util.h"
-#include "sandbox/win/src/sandbox_policy_base.h"
+#include "sandbox/win/src/sandbox_policy.h"
 #include "sandbox/win/src/win_utils.h"
 #include "ui/gfx/win/direct_write.h"
 
 static sandbox::BrokerServices* g_broker_services = NULL;
 static sandbox::TargetServices* g_target_services = NULL;
 
 namespace content {
 namespace {
 
 // The DLLs listed here are known (or under strong suspicion) of causing crashes
@@ skipping 746 matching lines @@
   base::win::ScopedProcessInformation target(temp_process_info);
 
   TRACE_EVENT_END0("startup", "StartProcessWithAccess::LAUNCHPROCESS");
 
   if (sandbox::SBOX_ALL_OK != result) {
     if (result == sandbox::SBOX_ERROR_GENERIC)
       DPLOG(ERROR) << "Failed to launch process";
     else if (result == sandbox::SBOX_ERROR_CREATE_PROCESS) {
       // TODO(shrikant): Remove this special case handling after determining
       // cause for lowbox/createprocess errors.
-      sandbox::PolicyBase* policy_base =
-          static_cast<sandbox::PolicyBase*>(policy);
-      UMA_HISTOGRAM_SPARSE_SLOWLY(policy_base->GetLowBoxSid() ?
-                                      "Process.Sandbox.Lowbox.Launch.Error" :
-                                      "Process.Sandbox.Launch.Error",
+      UMA_HISTOGRAM_SPARSE_SLOWLY(policy->GetLowBoxSid()
+                                      ? "Process.Sandbox.Lowbox.Launch.Error"

[cpu_(ooo_6.6-7.5), 2016/01/06 18:09:40]

can you please remove the UMA_HISTO call?  I don't think anybody cares or
monitors these.

+                                      : "Process.Sandbox.Launch.Error",
                                   last_error);
     } else
       DLOG(ERROR) << "Failed to launch process. Error: " << result;
 
     return base::Process();
   }
 
   delegate->PostSpawnTarget(target.process_handle());
 
   CHECK(ResumeThread(target.thread_handle()) != static_cast<DWORD>(-1));
@@ skipping 31 matching lines @@
   }
 
   return false;
 }
 
 bool BrokerAddTargetPeer(HANDLE peer_process) {
   return g_broker_services->AddTargetPeer(peer_process) == sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content