Use the new dll injection blocking api of the sandbox to block...

chrome/app/chrome_dll_main.cc

 // Copyright (c) 2006-2008 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 <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #include <new.h>
 
 #include "base/at_exit.h"
@@ skipping 68 matching lines @@
   // Get the breakpad pointer from chrome.exe
   typedef void (__stdcall *DumpProcessFunction)();
   DumpProcessFunction DumpProcess = reinterpret_cast<DumpProcessFunction>(
       ::GetProcAddress(::GetModuleHandle(L"chrome.exe"), "DumpProcess"));
   if (DumpProcess)
     DumpProcess();
 }
 
 #pragma optimize("", on)
 
-
-// Try to unload DLLs that malfunction with the sandboxed processes.
-static void EvictTroublesomeDlls() {
-  const wchar_t* troublesome_dlls[] = {
-      L"smumhook.dll",  // spyware doctor version 5 and above.
-      NULL              // Must be null. Here you can add with the debugger.
-  };
-
-  for(int ix = 0; ix != arraysize(troublesome_dlls); ++ix) {
-    if (!troublesome_dlls[ix])
-      break;
-    HMODULE module = ::GetModuleHandleW(troublesome_dlls[ix]);
-    if (module) {
-      LOG(WARNING) << "dll to evict found: " << ix;
-      if (::FreeLibrary(module)) {
-        DCHECK(NULL == ::GetModuleHandleW(troublesome_dlls[ix]));
-      }
-    }
-  }
-}
-
 }  // namespace
 
 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
                                  sandbox::SandboxInterfaceInfo* sandbox_info,
                                  TCHAR* command_line, int show_command) {
   // Register the invalid param handler and pure call handler to be able to
   // notify breakpad when it happens.
   _set_invalid_parameter_handler(InvalidParameter);
   _set_purecall_handler(PureCall);
   // Gather allocation failure.
@@ skipping 57 matching lines @@
   sandbox::TargetServices* target_services = NULL;
   sandbox::BrokerServices* broker_services = NULL;
   if (sandbox_info) {
     target_services = sandbox_info->target_services;
     broker_services = sandbox_info->broker_services;
   }
 
   std::wstring process_type =
     parsed_command_line.GetSwitchValue(switches::kProcessType);
 
-  bool do_dll_eviction = false;
-
   // Checks if the sandbox is enabled in this process and initializes it if this
   // is the case. The crash handler depends on this so it has to be done before
   // its initialization.
   if (target_services && !parsed_command_line.HasSwitch(switches::kNoSandbox)) {
     if ((process_type == switches::kRendererProcess) ||
         (process_type == switches::kPluginProcess &&
          parsed_command_line.HasSwitch(switches::kSafePlugins))) {
       target_services->Init();
-      do_dll_eviction = true;
     }
   }
 
   _Module.Init(NULL, instance);
 
   // Notice a user data directory override if any
   const std::wstring user_data_dir =
       parsed_command_line.GetSwitchValue(switches::kUserDataDir);
   if (!user_data_dir.empty())
     PathService::Override(chrome::DIR_USER_DATA, user_data_dir);
@@ skipping 20 matching lines @@
   }
 #endif  // NDEBUG
 
   if (!process_type.empty()) {
     // Initialize ResourceBundle which handles files loaded from external
     // sources.  The language should have been passed in to us from the
     // browser process as a command line flag.
     ResourceBundle::InitSharedInstance(std::wstring());
   }
 
-  // Eviction of injected DLLs is done early enough that it is likely
-  // to only cover DLLs injected by means of appInit_dlls registry key.
-  if (do_dll_eviction)
-      EvictTroublesomeDlls();
-
   startup_timer.Stop();  // End of Startup Time Measurement.
 
   int rv;
   if (process_type == switches::kRendererProcess) {
     rv = RendererMain(parsed_command_line, show_command, target_services);
   } else if (process_type == switches::kPluginProcess) {
     rv = PluginMain(parsed_command_line, show_command, target_services);
   } else if (process_type.empty()) {
     int ole_result = OleInitialize(NULL);
     DCHECK(ole_result == S_OK);
@@ skipping 12 matching lines @@
   _CrtDumpMemoryLeaks();
 #endif  // _CRTDBG_MAP_ALLOC
 
   _Module.Term();
 
   logging::CleanupChromeLogging();
 
   return rv;
 }