Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: content/common/sandbox_win.cc

Issue 1460903002: Unify PolicyBase into TargetPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_dispatcher
Patch Set: Rebase. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sandbox/win/BUILD.gn » ('j') | sandbox/win/src/sandbox_policy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_win.cc
diff --git a/content/common/sandbox_win.cc b/content/common/sandbox_win.cc
index 5f0c5b246321243d11b1d0428128b374fdd8683a..2d35357aa38a833aff34a9fad0a794ac428cf166 100644
--- a/content/common/sandbox_win.cc
+++ b/content/common/sandbox_win.cc
@@ -35,7 +35,7 @@
#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"
@@ -802,11 +802,9 @@ base::Process StartSandboxedProcess(
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
+ : "Process.Sandbox.Launch.Error",
last_error);
} else
DLOG(ERROR) << "Failed to launch process. Error: " << result;
« no previous file with comments | « no previous file | sandbox/win/BUILD.gn » ('j') | sandbox/win/src/sandbox_policy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698