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

54 files changed, 59 insertions, 100 deletions

diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc
index edbe7cd..d0a709f 100644
--- a/base/base_paths_android.cc
+++ b/base/base_paths_android.cc
@@ -13,7 +13,7 @@
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/process_metrics.h"
 
 namespace base {
 
diff --git a/base/base_paths_posix.cc b/base/base_paths_posix.cc
index 6d7b5e1..2d5fcbd 100644
--- a/base/base_paths_posix.cc
+++ b/base/base_paths_posix.cc
@@ -17,7 +17,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/nix/xdg_util.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/process_metrics.h"
 #include "build/build_config.h"
 
 #if defined(OS_FREEBSD)
diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc
index 424dfe2..096e343 100644
--- a/base/debug/profiler.cc
+++ b/base/debug/profiler.cc
@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 
diff --git a/base/debug/stack_trace_ios.mm b/base/debug/stack_trace_ios.mm
index ab0abc4..998dd0d 100644
--- a/base/debug/stack_trace_ios.mm
+++ b/base/debug/stack_trace_ios.mm
@@ -2,8 +2,6 @@
 // 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"
-
 #import <Foundation/Foundation.h>
 #include <mach/task.h>
 #include <stdio.h>
diff --git a/base/debug/stack_trace_unittest.cc b/base/debug/stack_trace_unittest.cc
index d290181..b676327 100644
--- a/base/debug/stack_trace_unittest.cc
+++ b/base/debug/stack_trace_unittest.cc
@@ -8,7 +8,8 @@
 
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/process_handle.h"
 #include "base/test/test_timeouts.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
diff --git a/base/debug/stack_trace_win.cc b/base/debug/stack_trace_win.cc
index 5622a4b..986241b 100644
--- a/base/debug/stack_trace_win.cc
+++ b/base/debug/stack_trace_win.cc
@@ -13,7 +13,7 @@
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/win/windows_version.h"
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index 3b92646..44d1f71 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -14,7 +14,7 @@
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
-#include "base/process_util.h"
+#include "base/process/process_metrics.h"
 #include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
diff --git a/base/debug/trace_event_unittest.cc b/base/debug/trace_event_unittest.cc
index 348c1d0..5beea37 100644
--- a/base/debug/trace_event_unittest.cc
+++ b/base/debug/trace_event_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/platform_thread.h"
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index c29e2e0..39317a3 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -17,7 +17,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
diff --git a/base/linux_util.cc b/base/linux_util.cc
index bb96a33..5f9ecd4 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -19,7 +19,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 
diff --git a/base/memory/scoped_open_process.h b/base/memory/scoped_open_process.h
index 93ba387..8bb19e2 100644
--- a/base/memory/scoped_open_process.h
+++ b/base/memory/scoped_open_process.h
@@ -5,8 +5,7 @@
 #ifndef BASE_MEMORY_SCOPED_OPEN_PROCESS_H_
 #define BASE_MEMORY_SCOPED_OPEN_PROCESS_H_
 
-#include "base/process.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 
 namespace base {
 
diff --git a/base/memory/shared_memory.h b/base/memory/shared_memory.h
index 7f19bd7..23f6973 100644
--- a/base/memory/shared_memory.h
+++ b/base/memory/shared_memory.h
@@ -17,7 +17,7 @@
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
-#include "base/process.h"
+#include "base/process/process_handle.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
diff --git a/base/memory/shared_memory_posix.cc b/base/memory/shared_memory_posix.cc
index a52e73a..e6745ea 100644
--- a/base/memory/shared_memory_posix.cc
+++ b/base/memory/shared_memory_posix.cc
@@ -14,7 +14,7 @@
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/process_metrics.h"
 #include "base/safe_strerror_posix.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
diff --git a/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc
index b1b664a..892fd7f 100644
--- a/base/memory/shared_memory_unittest.cc
+++ b/base/memory/shared_memory_unittest.cc
@@ -3,11 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
-#if defined(OS_MACOSX)
-#include "base/mac/scoped_nsautorelease_pool.h"
-#endif
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
+#include "base/process/kill.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc
index 6d9863a..589d077 100644
--- a/base/message_loop/message_pump_win.cc
+++ b/base/message_loop/message_pump_win.cc
@@ -9,7 +9,7 @@
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "base/process_util.h"
+#include "base/process/memory.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/wrapped_window_proc.h"
 
diff --git a/base/metrics/histogram_base.cc b/base/metrics/histogram_base.cc
index 352c01f..5b46d29 100644
--- a/base/metrics/histogram_base.cc
+++ b/base/metrics/histogram_base.cc
@@ -13,7 +13,7 @@
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/pickle.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 
diff --git a/base/metrics/stats_table.cc b/base/metrics/stats_table.cc
index e61ca89..4a3d939 100644
--- a/base/metrics/stats_table.cc
+++ b/base/metrics/stats_table.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 88928db..8fd3397 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/memory/shared_memory.h"
 #include "base/metrics/stats_counters.h"
 #include "base/metrics/stats_table.h"
+#include "base/process/kill.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/base/process.h b/base/process.h
deleted file mode 100644
index 71f4391..0000000
--- a/base/process.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2013 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.
-
-// Forwarding header until all include paths can be updated.
-// TODO(rsesek): Remove this file <http://crbug.com/242290>.
-
-#ifndef BASE_PROCESS_H_
-#define BASE_PROCESS_H_
-
-#include "base/process/process.h"
-
-#endif  // BASE_PROCESS_H_
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 {
diff --git a/base/process_info.h b/base/process_info.h
deleted file mode 100644
index 17502b8..0000000
--- a/base/process_info.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2013 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.
-
-// Forwarding header until all include paths can be updated.
-// TODO(rsesek): Remove this file <http://crbug.com/242290>.
-
-#ifndef BASE_PROCESS_INFO_H_
-#define BASE_PROCESS_INFO_H_
-
-#include "base/process/process_info.h"
-
-#endif  // BASE_PROCESS_INFO_H_
diff --git a/base/process_util.h b/base/process_util.h
deleted file mode 100644
index 1c980c3..0000000
--- a/base/process_util.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2013 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.
-
-// Forwarding header until all include paths can be updated.
-// TODO(rsesek): Remove this file <http://crbug.com/242290>.
-
-#ifndef BASE_PROCESS_UTIL_H_
-#define BASE_PROCESS_UTIL_H_
-
-#include "base/process/kill.h"
-#include "base/process/launch.h"
-#include "base/process/memory.h"
-#include "base/process/process_handle.h"
-#include "base/process/process_iterator.h"
-#include "base/process/process_metrics.h"
-
-#endif  // BASE_PROCESS_UTIL_H_
diff --git a/base/test/multiprocess_test.h b/base/test/multiprocess_test.h
index 7c3af33..3bbb739 100644
--- a/base/test/multiprocess_test.h
+++ b/base/test/multiprocess_test.h
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/process.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
+#include "base/process/process_handle.h"
 #include "build/build_config.h"
 #include "testing/platform_test.h"
 
diff --git a/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc
index 50aefd8..9367426 100644
--- a/base/test/multiprocess_test_android.cc
+++ b/base/test/multiprocess_test_android.cc
@@ -9,7 +9,6 @@
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/process.h"
 #include "testing/multiprocess_func_list.h"
 
 namespace base {
diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc
index 7a2d1c9..8cfbb73 100644
--- a/base/test/perf_test_suite.cc
+++ b/base/test/perf_test_suite.cc
@@ -9,7 +9,7 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/base/test/test_launcher.cc b/base/test/test_launcher.cc
index aae48a5..b217d63 100644
--- a/base/test/test_launcher.cc
+++ b/base/test/test_launcher.cc
@@ -13,7 +13,8 @@
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
diff --git a/base/test/test_process_killer_win.cc b/base/test/test_process_killer_win.cc
index bcc2d5b..5e9cc52 100644
--- a/base/test/test_process_killer_win.cc
+++ b/base/test/test_process_killer_win.cc
@@ -10,7 +10,8 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/process_iterator.h"
 #include "base/strings/string_util.h"
 #include "base/win/scoped_handle.h"
 
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 635423f..27c00c9 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -16,7 +16,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/memory.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
index cc00ce6..38963c2 100644
--- a/base/tracked_objects.cc
+++ b/base/tracked_objects.cc
@@ -12,7 +12,7 @@
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/port.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/profiler/alternate_timer.h"
 #include "base/strings/stringprintf.h"
 #include "base/third_party/valgrind/memcheck.h"
diff --git a/base/tracked_objects_unittest.cc b/base/tracked_objects_unittest.cc
index 6aa02ee..d2654c7 100644
--- a/base/tracked_objects_unittest.cc
+++ b/base/tracked_objects_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/tracked_objects.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc
index ce5262e..d238192 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -14,7 +14,7 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
-#include "base/process.h"
+#include "base/process/process.h"
 #include "base/strings/stringprintf.h"
 #include "base/win/event_trace_controller.h"
 #include "base/win/event_trace_provider.h"
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index 079a04b..16bf1e1 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
-#include "base/process.h"
+#include "base/process/process.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/win/event_trace_controller.h"
diff --git a/base/win/message_window.cc b/base/win/message_window.cc
index eb5e069..5666074 100644
--- a/base/win/message_window.cc
+++ b/base/win/message_window.cc
@@ -6,7 +6,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/memory.h"
 #include "base/win/wrapped_window_proc.h"
 
 const wchar_t kMessageWindowClassName[] = L"Chrome_MessageWindow";
diff --git a/base/win/scoped_process_information_unittest.cc b/base/win/scoped_process_information_unittest.cc
index 75b69e37..b8ffc44 100644
--- a/base/win/scoped_process_information_unittest.cc
+++ b/base/win/scoped_process_information_unittest.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
 #include "base/test/multiprocess_test.h"
 #include "base/win/scoped_process_information.h"
 #include "testing/multiprocess_func_list.h"
diff --git a/base/win/wrapped_window_proc.cc b/base/win/wrapped_window_proc.cc
index 04e59c5..61b79ed 100644
--- a/base/win/wrapped_window_proc.cc
+++ b/base/win/wrapped_window_proc.cc
@@ -6,7 +6,7 @@
 
 #include "base/atomicops.h"
 #include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/memory.h"
 
 namespace {
 
diff --git a/chrome/browser/media/webrtc_browsertest_common.cc b/chrome/browser/media/webrtc_browsertest_common.cc
index 83c24fc..cf067b6 100644
--- a/chrome/browser/media/webrtc_browsertest_common.cc
+++ b/chrome/browser/media/webrtc_browsertest_common.cc
@@ -6,7 +6,6 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc
index 1d80518..cc0c449 100644
--- a/chrome/browser/printing/printing_layout_browsertest.cc
+++ b/chrome/browser/printing/printing_layout_browsertest.cc
@@ -8,6 +8,7 @@
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
+#include "base/process/process.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_file_util.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc
index 9f43ecd..841e657 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database.cc
@@ -12,6 +12,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
+#include "base/process/process.h"
 #include "base/process/process_metrics.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/prefix_set.h"
diff --git a/components/nacl/common/nacl_types.h b/components/nacl/common/nacl_types.h
index c1f6943..b3fee25 100644
--- a/components/nacl/common/nacl_types.h
+++ b/components/nacl/common/nacl_types.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/process.h"
+#include "base/process/process_handle.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index ce0f626..b5bb3f4 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
+#include "base/process/process.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
index e9b2608..5e1768d 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -32,6 +32,7 @@
 #include "base/format_macros.h"
 #include "base/md5.h"
 #include "base/platform_file.h"
+#include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
diff --git a/webkit/child/webkit_child_helpers.cc b/webkit/child/webkit_child_helpers.cc
index 6777955..422163f 100644
--- a/webkit/child/webkit_child_helpers.cc
+++ b/webkit/child/webkit_child_helpers.cc
@@ -10,7 +10,7 @@
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process_util.h"
+#include "base/process/process_metrics.h"
 #include "v8/include/v8.h"
 
 namespace webkit_glue {