Index: content/utility/utility_main.cc |
=================================================================== |
--- content/utility/utility_main.cc (revision 0) |
+++ content/utility/utility_main.cc (working copy) |
@@ -6,21 +6,15 @@ |
#include "base/message_loop.h" |
#include "base/system_monitor/system_monitor.h" |
#include "base/threading/platform_thread.h" |
-#include "chrome/common/chrome_paths.h" |
-#include "chrome/common/extensions/extension_l10n_util.h" |
-#include "chrome/utility/utility_thread.h" |
#include "content/common/child_process.h" |
+#include "content/common/content_switches.h" |
#include "content/common/hi_res_timer_manager.h" |
#include "content/common/main_function_params.h" |
-#include "ui/base/ui_base_switches.h" |
+#include "content/utility/utility_thread.h" |
#if defined(OS_WIN) |
-#include "base/file_util.h" |
-#include "base/path_service.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "content/common/sandbox_init_wrapper.h" |
#include "sandbox/src/sandbox.h" |
-#endif // defined(OS_WIN) |
+#endif |
// Mainline routine for running as the utility process. |
int UtilityMain(const MainFunctionParams& parameters) { |
@@ -33,16 +27,8 @@ |
ChildProcess utility_process; |
utility_process.set_main_thread(new UtilityThread()); |
-#if defined(OS_WIN) |
- // Load the pdf plugin before the sandbox is turned on. This is for Windows |
- // only because we need this DLL only on Windows. |
- FilePath pdf; |
- if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) && |
- file_util::PathExists(pdf)) { |
- bool rv = !!LoadLibrary(pdf.value().c_str()); |
- DCHECK(rv) << "Couldn't load PDF plugin"; |
- } |
+#if defined(OS_WIN) |
bool no_sandbox = parameters.command_line_.HasSwitch(switches::kNoSandbox); |
if (!no_sandbox) { |
sandbox::TargetServices* target_services = |
@@ -53,11 +39,6 @@ |
} |
#endif |
- CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- std::string lang = command_line->GetSwitchValueASCII(switches::kLang); |
- if (!lang.empty()) |
- extension_l10n_util::SetProcessLocale(lang); |
- |
MessageLoop::current()->Run(); |
return 0; |