Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e

48 files changed, 56 insertions, 100 deletions

diff --git a/base/base_paths_android.cc b/base/base_paths_android.cc
index edbe7cdc12..d0a709fc3a 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 6d7b5e13c5..2d5fcbd26d 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/base_unittests.isolate b/base/base_unittests.isolate
index 483d6f24b5..852997b106 100644
--- a/base/base_unittests.isolate
+++ b/base/base_unittests.isolate
@@ -16,7 +16,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '../tools/swarm_client/run_test_cases.py',
+          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
@@ -30,7 +30,7 @@
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
           '../tools/swarm_client/run_isolated.py',
-          '../tools/swarm_client/run_test_cases.py',
+          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
@@ -39,7 +39,7 @@
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '../tools/swarm_client/run_test_cases.py',
+          '../tools/swarm_client/googletest/run_test_cases.py',
           '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc
index 424dfe28b4..096e343e00 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 ab0abc40ee..998dd0dfc6 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 d290181572..b676327d7a 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 5622a4b5a4..986241b0a3 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 3b92646e31..44d1f71345 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 348c1d0be4..5beea3715c 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 c29e2e05bb..39317a3a93 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 bb96a33927..5f9ecd43ab 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 93ba387afb..8bb19e241e 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 7f19bd71ca..23f6973374 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 a52e73af99..e6745ea3a7 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 b1b664a618..892fd7f1a5 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 6d9863a92a..589d077541 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 352c01fc52..5b46d2990c 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 e61ca89241..4a3d939cfe 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 88928dbf52..8fd33971f4 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 71f4391c3f..0000000000
--- 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 f7ee14cc9f..f81ea9090d 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 61a60204e4..5938fa5323 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 eb09254e75..99a7c66185 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 336633c305..3708af6bac 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 2ad1e50807..de79477e95 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 637433b38d..3508ccb04c 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 f8ab2a2ea9..aa8ba74aba 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 e2da95d647..6da51ca3b5 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 2db5d48ad3..e329b4ef73 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 a446b98cff..3d8b31d035 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 4a3d36d778..77f058c8f2 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 c82535d2e4..cad0f1b09f 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 30945f2a68..1217b50989 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 17502b8336..0000000000
--- 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 1c980c3abd..0000000000
--- 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 7c3af3395d..3bbb7396c0 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 50aefd8812..93674269eb 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 7a2d1c92d9..8cfbb730f8 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 aae48a540f..b217d63282 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 bcc2d5b392..5e9cc5274c 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 635423feb0..27c00c9434 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 cc00ce6081..38963c2343 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 6aa02ee18e..d2654c7cd1 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 ce5262e9b5..d238192c4f 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 079a04b730..16bf1e134a 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 eb5e069d1f..56660740fc 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 75b69e3776..b8ffc4427c 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 04e59c5559..61b79eda88 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 {