From 9963aaa721aa78f81862644e0616815f3bd47a19 Mon Sep 17 00:00:00 2001 From: "brettw@google.com" Date: Fri, 14 Nov 2008 04:01:35 +0000 Subject: More Mac & Linux fixes for base namespaces. Review URL: http://codereview.chromium.org/10739 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5450 0039d316-1c4b-4281-b951-d872f2087c98 --- base/process_posix.cc | 6 +++--- base/process_util_linux.cc | 6 +++--- base/process_util_mac.mm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/process_posix.cc b/base/process_posix.cc index d3f0f31..162ba35 100644 --- a/base/process_posix.cc +++ b/base/process_posix.cc @@ -44,16 +44,16 @@ int32 Process::pid() const { if (process_ == 0) return 0; - return process_util::GetProcId(process_); + return GetProcId(process_); } bool Process::is_current() const { - return process_ == process_util::GetCurrentProcessHandle(); + return process_ == GetCurrentProcessHandle(); } // static Process Process::Current() { - return Process(process_util::GetCurrentProcessHandle()); + return Process(GetCurrentProcessHandle()); } } // namspace base diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index 1c31f9f..4e0371c 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -275,10 +275,10 @@ bool CleanupProcesses(const std::wstring& executable_name, int exit_code, const ProcessFilter* filter) { bool exited_cleanly = - process_util::WaitForProcessesToExit(executable_name, wait_milliseconds, - filter); + WaitForProcessesToExit(executable_name, wait_milliseconds, + filter); if (!exited_cleanly) - process_util::KillProcesses(executable_name, exit_code, filter); + KillProcesses(executable_name, exit_code, filter); return exited_cleanly; } diff --git a/base/process_util_mac.mm b/base/process_util_mac.mm index 8b03aa7..0ca6ab8 100644 --- a/base/process_util_mac.mm +++ b/base/process_util_mac.mm @@ -11,7 +11,7 @@ #include #include -namespace process_util { +namespace base { bool LaunchApp(const std::vector& argv, bool wait, ProcessHandle* process_handle) { @@ -63,4 +63,4 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) { return false; } -} // namespace process_util +} // namespace base -- cgit v1.1