From f7145ef6e9ebf49cf6da886b8f807efdbcce46f9 Mon Sep 17 00:00:00 2001 From: Aaron Klotz Date: Tue, 30 Dec 2014 10:46:05 -0700 Subject: [PATCH] Bug 998863: Fix non-unified build bustage r=bustage --HG-- extra : rebase_source : 521f9fd6ce378021fa560c198b1d7b2f47ad4462 --- dom/plugins/ipc/PluginProcessParent.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/plugins/ipc/PluginProcessParent.cpp b/dom/plugins/ipc/PluginProcessParent.cpp index 4b6405499e9f..fe45ca2e5b8d 100644 --- a/dom/plugins/ipc/PluginProcessParent.cpp +++ b/dom/plugins/ipc/PluginProcessParent.cpp @@ -12,15 +12,14 @@ #include "mozilla/ipc/BrowserProcessSubThread.h" #include "mozilla/plugins/PluginMessageUtils.h" #include "mozilla/Telemetry.h" -#include "mozilla/UniquePtr.h" #include "nsThreadUtils.h" using std::vector; using std::string; -using namespace mozilla; using mozilla::ipc::BrowserProcessSubThread; using mozilla::ipc::GeckoChildProcessHost; +using mozilla::plugins::LaunchCompleteTask; using mozilla::plugins::PluginProcessParent; using base::ProcessArchitecture; @@ -44,7 +43,7 @@ PluginProcessParent::~PluginProcessParent() } bool -PluginProcessParent::Launch(UniquePtr aLaunchCompleteTask) +PluginProcessParent::Launch(mozilla::UniquePtr aLaunchCompleteTask) { ProcessArchitecture currentArchitecture = base::GetCurrentProcessArchitecture(); uint32_t containerArchitectures = GetSupportedArchitecturesForProcessType(GeckoProcessType_Plugin); @@ -79,7 +78,7 @@ PluginProcessParent::Launch(UniquePtr aLaunchCompleteTask) } } - mLaunchCompleteTask = Move(aLaunchCompleteTask); + mLaunchCompleteTask = mozilla::Move(aLaunchCompleteTask); vector args; args.push_back(MungePluginDsoPath(mPluginFilePath));