Add Terminate() to the Process object, have RenderProcessHost use this to avo...

base/trace_event.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/trace_event.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 
 #define USE_UNRELIABLE_NOW
 
 namespace base {
 
 static const char* kEventTypeNames[] = {
   "BEGIN",
   "END",
   "INSTANT"
 };
 
 static const FilePath::CharType* kLogFileName =
     FILE_PATH_LITERAL("trace_%d.log");
 
 TraceLog::TraceLog() : enabled_(false), log_file_(NULL) {
-  ProcessHandle proc = process_util::GetCurrentProcessHandle();
-  process_metrics_.reset(process_util::ProcessMetrics::CreateProcessMetrics(proc));
+  base::ProcessHandle proc = base::GetCurrentProcessHandle();
+  process_metrics_.reset(base::ProcessMetrics::CreateProcessMetrics(proc));
 }
 
 TraceLog::~TraceLog() {
   Stop();
 }
 
 // static
 bool TraceLog::IsTracing() {
   TraceLog* trace = Singleton<TraceLog>::get();
   return trace->enabled_;
@@ skipping 38 matching lines @@
 }
 
 void TraceLog::CloseLogFile() {
   if (log_file_) {
     file_util::CloseFile(log_file_);
   }
 }
 
 bool TraceLog::OpenLogFile() {
   FilePath::StringType pid_filename =
-      StringPrintf(kLogFileName, process_util::GetCurrentProcId());
+      StringPrintf(kLogFileName, base::GetCurrentProcId());
   FilePath log_file_path;
   if (!PathService::Get(base::DIR_EXE, &log_file_path))
     return false;
   log_file_path = log_file_path.Append(pid_filename);
   log_file_ = file_util::OpenFile(log_file_path, "a");
   if (!log_file_) {
     // try the current directory
     log_file_ = file_util::OpenFile(FilePath(pid_filename), "a");
     if (!log_file_) {
       return false;
@@ skipping 26 matching lines @@
   TimeTicks tick = TimeTicks::HighResNow();
 #else
   TimeTicks tick = TimeTicks::Now();
 #endif
   TimeDelta delta = tick - trace_start_time_;
   int64 usec = delta.InMicroseconds();
   std::string msg = 
     StringPrintf("{'pid':'0x%lx', 'tid':'0x%lx', 'type':'%s', "
                  "'name':'%s', 'id':'0x%lx', 'extra':'%s', 'file':'%s', "
                  "'line_number':'%d', 'usec_begin': %I64d},\r\n", 
-                 process_util::GetCurrentProcId(),
+                 base::GetCurrentProcId(),
                  PlatformThread::CurrentId(),
                  kEventTypeNames[type],
                  name.c_str(),
                  id,
                  extra.c_str(),
                  file, 
                  line,
                  usec);
 
   Log(msg);
 }
 
 void TraceLog::Log(const std::string& msg) {
   AutoLock lock(file_lock_);
 
   fprintf(log_file_, "%s", msg.c_str());
 }
 
 } // namespace base