| Index: content/child/child_process.cc
|
| diff --git a/content/common/child_process.cc b/content/child/child_process.cc
|
| similarity index 60%
|
| rename from content/common/child_process.cc
|
| rename to content/child/child_process.cc
|
| index e8293a4fa9fab2a3d4155ceca5a2e1353bc4b232..87759810672ad237e4e96aae34dfe9f2c6907a06 100644
|
| --- a/content/common/child_process.cc
|
| +++ b/content/child/child_process.cc
|
| @@ -2,11 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "content/common/child_process.h"
|
| -
|
| -#if defined(OS_POSIX) && !defined(OS_ANDROID)
|
| -#include <signal.h> // For SigUSR1Handler below.
|
| -#endif
|
| +#include "content/child/child_process.h"
|
|
|
| #include "base/message_loop.h"
|
| #include "base/metrics/statistics_recorder.h"
|
| @@ -14,16 +10,12 @@
|
| #include "base/string_number_conversions.h"
|
| #include "base/threading/thread.h"
|
| #include "base/utf_string_conversions.h"
|
| -#include "content/common/child_thread.h"
|
| +#include "content/child/child_thread.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/debug/debugger.h"
|
| #endif
|
|
|
| -#if defined(OS_POSIX) && !defined(OS_ANDROID)
|
| -static void SigUSR1Handler(int signal) { }
|
| -#endif
|
| -
|
| namespace content {
|
| // The singleton instance for this process.
|
| ChildProcess* child_process = NULL;
|
| @@ -100,43 +92,4 @@ base::WaitableEvent* ChildProcess::GetShutDownEvent() {
|
| return &child_process->shutdown_event_;
|
| }
|
|
|
| -void ChildProcess::WaitForDebugger(const std::string& label) {
|
| -#if defined(OS_WIN)
|
| -#if defined(GOOGLE_CHROME_BUILD)
|
| - std::string title = "Google Chrome";
|
| -#else // CHROMIUM_BUILD
|
| - std::string title = "Chromium";
|
| -#endif // CHROMIUM_BUILD
|
| - title += " ";
|
| - title += label; // makes attaching to process easier
|
| - std::string message = label;
|
| - message += " starting with pid: ";
|
| - message += base::IntToString(base::GetCurrentProcId());
|
| - ::MessageBox(NULL, UTF8ToWide(message).c_str(), UTF8ToWide(title).c_str(),
|
| - MB_OK | MB_SETFOREGROUND);
|
| -#elif defined(OS_POSIX)
|
| -#if defined(OS_ANDROID)
|
| - LOG(ERROR) << label << " waiting for GDB.";
|
| - // Wait 24 hours for a debugger to be attached to the current process.
|
| - base::debug::WaitForDebugger(24 * 60 * 60, false);
|
| -#else
|
| - // TODO(playmobil): In the long term, overriding this flag doesn't seem
|
| - // right, either use our own flag or open a dialog we can use.
|
| - // This is just to ease debugging in the interim.
|
| - LOG(ERROR) << label
|
| - << " ("
|
| - << getpid()
|
| - << ") paused waiting for debugger to attach. "
|
| - << "Send SIGUSR1 to unpause.";
|
| - // Install a signal handler so that pause can be woken.
|
| - struct sigaction sa;
|
| - memset(&sa, 0, sizeof(sa));
|
| - sa.sa_handler = SigUSR1Handler;
|
| - sigaction(SIGUSR1, &sa, NULL);
|
| -
|
| - pause();
|
| -#endif // defined(OS_ANDROID)
|
| -#endif // defined(OS_POSIX)
|
| -}
|
| -
|
| } // namespace content
|
|
|