Update include paths in base for base/process changes.

This also updates any stragglers that I missed, fixes mistakes I may have made,
and deletes the forwarding headers.

After this CL, the proces_util.h project is complete.

BUG=242290
TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/20265004

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

13 files changed, 20 insertions, 18 deletions

diff --git a/base/process/kill.h b/base/process/kill.h
index f7ee14c..f81ea90 100644
--- a/base/process/kill.h
+++ b/base/process/kill.h
@@ -9,7 +9,7 @@
 #define BASE_PROCESS_KILL_H_
 
 #include "base/files/file_path.h"
-#include "base/process.h"
+#include "base/process/process_handle.h"
 #include "base/time/time.h"
 
 namespace base {
diff --git a/base/process/kill_posix.cc b/base/process/kill_posix.cc
index 61a6020..5938fa5 100644
--- a/base/process/kill_posix.cc
+++ b/base/process/kill_posix.cc
@@ -13,7 +13,6 @@
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process/process_iterator.h"
-#include "base/process_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/threading/platform_thread.h"
diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
index eb09254..99a7c66 100644
--- a/base/process/kill_win.cc
+++ b/base/process/kill_win.cc
@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_iterator.h"
-#include "base/process_util.h"
 #include "base/win/object_watcher.h"
 
 namespace base {
diff --git a/base/process/launch_posix.cc b/base/process/launch_posix.cc
index 336633c..3708af6 100644
--- a/base/process/launch_posix.cc
+++ b/base/process/launch_posix.cc
@@ -29,7 +29,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/process_metrics.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
diff --git a/base/process/memory.h b/base/process/memory.h
index 2ad1e50..de79477e 100644
--- a/base/process/memory.h
+++ b/base/process/memory.h
@@ -5,9 +5,9 @@
 #ifndef BASE_PROCESS_MEMORY_H_
 #define BASE_PROCESS_MEMORY_H_
 
-#include "base/basictypes.h"
 #include "base/base_export.h"
-#include "base/process.h"
+#include "base/basictypes.h"
+#include "base/process/process_handle.h"
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
diff --git a/base/process/process_handle_openbsd.cc b/base/process/process_handle_openbsd.cc
index 637433b..3508ccb 100644
--- a/base/process/process_handle_openbsd.cc
+++ b/base/process/process_handle_openbsd.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 
 #include <sys/sysctl.h>
 #include <sys/types.h>
diff --git a/base/process/process_iterator.h b/base/process/process_iterator.h
index f8ab2a2..aa8ba74 100644
--- a/base/process/process_iterator.h
+++ b/base/process/process_iterator.h
@@ -11,11 +11,11 @@
 #include <string>
 #include <vector>
 
-#include "build/build_config.h"
-#include "base/basictypes.h"
 #include "base/base_export.h"
+#include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "base/process.h"
+#include "base/process/process.h"
+#include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
diff --git a/base/process/process_iterator_linux.cc b/base/process/process_iterator_linux.cc
index e2da95d..6da51ca 100644
--- a/base/process/process_iterator_linux.cc
+++ b/base/process/process_iterator_linux.cc
@@ -7,7 +7,6 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/process/internal_linux.h"
-#include "base/process_util.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 
diff --git a/base/process/process_metrics.h b/base/process/process_metrics.h
index 2db5d48..e329b4e 100644
--- a/base/process/process_metrics.h
+++ b/base/process/process_metrics.h
@@ -12,7 +12,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/process.h"
+#include "base/process/process_handle.h"
 #include "base/time/time.h"
 
 #if defined(OS_MACOSX)
diff --git a/base/process/process_posix.cc b/base/process/process_posix.cc
index a446b98..3d8b31d 100644
--- a/base/process/process_posix.cc
+++ b/base/process/process_posix.cc
@@ -4,12 +4,12 @@
 
 #include "base/process/process.h"
 
-#include <sys/types.h>
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
-#include "base/process_util.h"
 #include "base/logging.h"
+#include "base/process/kill.h"
 
 namespace base {
 
diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc
index 4a3d36d..77f058c 100644
--- a/base/process/process_util_unittest.cc
+++ b/base/process/process_util_unittest.cc
@@ -14,7 +14,11 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
+#include "base/process/memory.h"
+#include "base/process/process.h"
+#include "base/process/process_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
diff --git a/base/process/process_util_unittest_ios.cc b/base/process/process_util_unittest_ios.cc
index c82535d..cad0f1b 100644
--- a/base/process/process_util_unittest_ios.cc
+++ b/base/process/process_util_unittest_ios.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
-#include "base/process_util.h"
+#include "base/process/process_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(ProcessUtilTestIos, Memory) {
diff --git a/base/process/process_win.cc b/base/process/process_win.cc
index 30945f2a..1217b50 100644
--- a/base/process/process_win.cc
+++ b/base/process/process_win.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/process/process.h"
+
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process_util.h"
 #include "base/win/windows_version.h"
 
 namespace base {