Bug 1330529 - Part 5: Remove some Windows line endings from PluginProcessChild.cpp. r?jimm
MozReview-Commit-ID: DhNuxymQ97U
--- a/dom/plugins/ipc/PluginProcessChild.cpp
+++ b/dom/plugins/ipc/PluginProcessChild.cpp
@@ -32,17 +32,16 @@ using mozilla::ipc::IOThreadChild;
#ifdef OS_WIN
#include <algorithm>
#endif
namespace mozilla {
namespace plugins {
-
bool
PluginProcessChild::Init(int aArgc, char* aArgv[])
{
nsDebugImpl::SetMultiprocessMode("NPAPI");
#if defined(XP_MACOSX)
// Remove the trigger for "dyld interposing" that we added in
// GeckoChildProcessHost::PerformAsyncLaunchInternal(), in the host
@@ -108,21 +107,21 @@ PluginProcessChild::Init(int aArgc, char
std::vector<std::wstring> values =
CommandLine::ForCurrentProcess()->GetLooseValues();
MOZ_ASSERT(values.size() >= 1, "not enough loose args");
pluginFilename = WideToUTF8(values[0]);
// We don't initialize XPCOM but we need the thread manager and the
// logging framework for the FunctionBroker.
- NS_SetMainThread();
- mozilla::TimeStamp::Startup();
- NS_LogInit();
+ NS_SetMainThread();
+ mozilla::TimeStamp::Startup();
+ NS_LogInit();
mozilla::LogModule::Init();
- nsThreadManager::get().Init();
+ nsThreadManager::get().Init();
#if defined(MOZ_SANDBOX)
// This is probably the earliest we would want to start the sandbox.
// As we attempt to tighten the sandbox, we may need to consider moving this
// to later in the plugin initialization.
mozilla::SandboxTarget::Instance()->StartSandbox();
#endif
#else
@@ -150,24 +149,24 @@ PluginProcessChild::Init(int aArgc, char
#endif
return retval;
}
void
PluginProcessChild::CleanUp()
{
#if defined(OS_WIN)
- MOZ_ASSERT(NS_IsMainThread());
-
- // Shutdown components we started in Init. Note that KillClearOnShutdown
- // is an event that is regularly part of XPCOM shutdown. We do not
- // call XPCOM's shutdown but we need this event to be sent to avoid
- // leaking objects labeled as ClearOnShutdown.
- nsThreadManager::get().Shutdown();
- mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
+ MOZ_ASSERT(NS_IsMainThread());
+
+ // Shutdown components we started in Init. Note that KillClearOnShutdown
+ // is an event that is regularly part of XPCOM shutdown. We do not
+ // call XPCOM's shutdown but we need this event to be sent to avoid
+ // leaking objects labeled as ClearOnShutdown.
+ nsThreadManager::get().Shutdown();
+ mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownFinal);
NS_LogTerm();
#endif
nsRegion::ShutdownStatic();
}
} // namespace plugins
} // namespace mozilla