chrome_elf/blacklist/blacklist.cc - Issue 2242323002: Revert of [chrome_elf] Big cleanup and removing dependencies that recently crept in. Part 1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_elf/blacklist/blacklist.cc

Issue 2242323002: Revert of [chrome_elf] Big cleanup and removing dependencies that recently crept in. Part 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 months 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

Index: chrome_elf/blacklist/blacklist.cc

diff --git a/chrome_elf/blacklist/blacklist.cc b/chrome_elf/blacklist/blacklist.cc

index 05d917fb6db8a32295d0c2f7a9ad96e65a195990..2b441a6a16efd0885de17d5bd0e42221b6c996b5 100644

--- a/chrome_elf/blacklist/blacklist.cc

+++ b/chrome_elf/blacklist/blacklist.cc

@@ -12,7 +12,7 @@

#include "chrome/install_static/install_util.h"

#include "chrome_elf/blacklist/blacklist_interceptions.h"

#include "chrome_elf/chrome_elf_constants.h"

-#include "chrome_elf/hook_util/hook_util.h"

+#include "chrome_elf/hook_util/thunk_getter.h"

#include "chrome_elf/nt_registry/nt_registry.h"

#include "sandbox/win/src/interception_internal.h"

#include "sandbox/win/src/internal_types.h"

@@ -291,7 +291,7 @@

const bool kRelaxed = false;

// Create a thunk via the appropriate ServiceResolver instance.

- sandbox::ServiceResolverThunk* thunk = elf_hook::HookSystemService(kRelaxed);

+ sandbox::ServiceResolverThunk* thunk = GetThunk(kRelaxed);

// Don't try blacklisting on unsupported OS versions.

if (!thunk)

« no previous file with comments | « chrome_elf/blacklist.gypi ('k') | chrome_elf/blacklist/blacklist_interceptions.cc » ('j') | no next file with comments »