Skip to content

Commit

Permalink
Revert 241548 "Chrome browser process DLL blacklist."
Browse files Browse the repository at this point in the history
This is breaking the Win builders (and the blacklist_test
is failing on 64 bits).

> Chrome browser process DLL blacklist.
> 
> This patch allows for blocking of module loading in the browser process.
> It does not actually prevent any modules from loading.
> 
> BUG=329023
> TEST=chrome_elf_unittests
> 
> Review URL: https://codereview.chromium.org/107663008

TBR=robertshield@chromium.org

Review URL: https://codereview.chromium.org/107443008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241568 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jchaffraix@chromium.org committed Dec 18, 2013
1 parent a259f7f commit a472fb1
Show file tree
Hide file tree
Showing 24 changed files with 13 additions and 918 deletions.
5 changes: 3 additions & 2 deletions chrome/app/chrome_exe_main_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,9 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prev, wchar_t*, int) {
if (AttemptFastNotify(*CommandLine::ForCurrentProcess()))
return 0;

// Signal Chrome Elf that Chrome has begun to start.
SignalChromeElf();
// The purpose of this call is to force the addition of an entry in the IAT
// for chrome_elf.dll to force a load time dependency.
InitChromeElf();

MetroDriver metro_driver;
if (metro_driver.in_metro_mode())
Expand Down
3 changes: 1 addition & 2 deletions chrome/chrome_exe.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,6 @@
}],
['OS=="win"', {
'dependencies': [
# Note that chrome_elf must be listed first. Do not reorder it.
'../chrome_elf/chrome_elf.gyp:chrome_elf',
'chrome_dll',
'chrome_nacl_win64',
'chrome_process_finder',
Expand All @@ -476,6 +474,7 @@
'../base/base.gyp:base',
'../breakpad/breakpad.gyp:breakpad_handler',
'../breakpad/breakpad.gyp:breakpad_sender',
'../chrome_elf/chrome_elf.gyp:chrome_elf',
'../components/components.gyp:breakpad_component',
'../components/components.gyp:policy',
'../sandbox/sandbox.gyp:sandbox',
Expand Down
1 change: 0 additions & 1 deletion chrome_elf/DEPS
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
include_rules = [
"+sandbox",
]
60 changes: 0 additions & 60 deletions chrome_elf/blacklist.gypi

This file was deleted.

274 changes: 0 additions & 274 deletions chrome_elf/blacklist/blacklist.cc

This file was deleted.

Loading

0 comments on commit a472fb1

Please sign in to comment.