Add Terminate() to the Process object, have RenderProcessHost use this to avoid some more Windows specific code.

Move Process and SharedMemory into the base namespace (most changes).

Review URL: http://codereview.chromium.org/10895

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5446 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 8 insertions, 8 deletions

diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc
index 943caec..0978d80 100644
--- a/net/tools/tld_cleanup/tld_cleanup.cc
+++ b/net/tools/tld_cleanup/tld_cleanup.cc
@@ -206,7 +206,7 @@ NormalizeResult NormalizeFile(const std::wstring& in_filename,
 }
 
 int main(int argc, const char* argv[]) {
-  process_util::EnableTerminationOnHeapCorruption();
+  base::EnableTerminationOnHeapCorruption();
   if (argc != 3) {
     fprintf(stderr, "Normalizes and verifies UTF-8 TLD data files\n");
     fprintf(stderr, "Usage: %s <input> <output>\n", argv[0]);
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 22372db..7e30b37 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -48,7 +48,7 @@ URLRequest::URLRequest(const GURL& url, Delegate* delegate)
       final_upload_progress_(0) {
   URLREQUEST_COUNT_CTOR();
   SIMPLE_STATS_COUNTER(L"URLRequestCount");
-  origin_pid_ = process_util::GetCurrentProcId();
+  origin_pid_ = base::GetCurrentProcId();
 
   // Sanity check out environment.
   DCHECK(MessageLoop::current()) <<
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index e60f402..c8498c5 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -185,7 +185,7 @@ class TestDelegate : public URLRequest::Delegate {
 
 // This object bounds the lifetime of an external python-based HTTP server
 // that can provide various responses useful for testing.
-class TestServer : public process_util::ProcessFilter {
+class TestServer : public base::ProcessFilter {
  public:
   TestServer(const std::wstring& document_root)
       : process_handle_(NULL),
@@ -205,7 +205,7 @@ class TestServer : public process_util::ProcessFilter {
     if (!process_handle_)
       return false;
     // TODO(port): rationalize return value of GetProcId
-    return pid == (uint32)process_util::GetProcId(process_handle_);
+    return pid == (uint32)base::GetProcId(process_handle_);
   }
 
   GURL TestServerPage(const std::string& path) {
@@ -293,7 +293,7 @@ class TestServer : public process_util::ProcessFilter {
     }
 
     ASSERT_TRUE(
-        process_util::LaunchApp(command_line, false, true, &process_handle_)) <<
+        base::LaunchApp(command_line, false, true, &process_handle_)) <<
         "Failed to launch " << command_line;
 #elif defined(OS_LINUX)
     bool tlslite_installed = !access("/usr/bin/tls.py", X_OK);
@@ -357,8 +357,8 @@ class TestServer : public process_util::ProcessFilter {
     // Make sure we don't leave any stray testserver processes laying around.
     std::wstring testserver_name =
         file_util::GetFilenameFromPath(python_runtime_);
-    process_util::CleanupProcesses(testserver_name, 10000, 1, this);
-    EXPECT_EQ(0, process_util::GetProcessCount(testserver_name, this));
+    base::CleanupProcesses(testserver_name, 10000, 1, this);
+    EXPECT_EQ(0, base::GetProcessCount(testserver_name, this));
 
     is_shutdown_ = true;
   }
@@ -391,7 +391,7 @@ class TestServer : public process_util::ProcessFilter {
 
   std::string base_address_;
   std::wstring python_runtime_;
-  ProcessHandle process_handle_;
+  base::ProcessHandle process_handle_;
   bool is_shutdown_;
 };