summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 14:08:52 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 14:08:52 +0000
commit66c5314f8d6819d696f441b00d3a0b8bd4267b70 (patch)
treeb2ffe5e9efeb628d6148eeb289203dc01cb737bf /net
parent5d329477a6fb5ec32e94e1a02e4a4d0ffcdde7c4 (diff)
downloadchromium_src-66c5314f8d6819d696f441b00d3a0b8bd4267b70.zip
chromium_src-66c5314f8d6819d696f441b00d3a0b8bd4267b70.tar.gz
chromium_src-66c5314f8d6819d696f441b00d3a0b8bd4267b70.tar.bz2
Update include paths in net for base/process changes.
BUG=242290 R=cbentzel@chromium.org Review URL: https://codereview.chromium.org/20004003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/cert/cert_database_mac.cc2
-rw-r--r--net/disk_cache/stress_cache.cc4
-rw-r--r--net/test/python_utils_unittest.cc2
-rw-r--r--net/test/spawned_test_server/local_test_server.cc2
-rw-r--r--net/test/spawned_test_server/local_test_server.h2
-rw-r--r--net/test/spawned_test_server/local_test_server_posix.cc4
-rw-r--r--net/test/spawned_test_server/local_test_server_win.cc2
-rw-r--r--net/tools/crash_cache/crash_cache.cc4
-rw-r--r--net/tools/dump_cache/dump_cache.cc2
-rw-r--r--net/tools/tld_cleanup/tld_cleanup.cc2
-rw-r--r--net/url_request/url_request_test_util.h1
-rw-r--r--net/url_request/url_request_unittest.cc1
12 files changed, 16 insertions, 12 deletions
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc
index e05af2e..7670196 100644
--- a/net/cert/cert_database_mac.cc
+++ b/net/cert/cert_database_mac.cc
@@ -10,7 +10,7 @@
#include "base/mac/mac_logging.h"
#include "base/message_loop/message_loop.h"
#include "base/observer_list_threadsafe.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
#include "base/single_thread_task_runner.h"
#include "base/synchronization/lock.h"
#include "crypto/mac_security_services_lock.h"
diff --git a/net/disk_cache/stress_cache.cc b/net/disk_cache/stress_cache.cc
index 47cc825..9c3c5a6 100644
--- a/net/disk_cache/stress_cache.cc
+++ b/net/disk_cache/stress_cache.cc
@@ -25,7 +25,9 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
+#include "base/process/process_handle.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/test/python_utils_unittest.cc b/net/test/python_utils_unittest.cc
index 55d6ead..04f11ec 100644
--- a/net/test/python_utils_unittest.cc
+++ b/net/test/python_utils_unittest.cc
@@ -8,7 +8,7 @@
#include "base/environment.h"
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "net/test/python_utils.h"
diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc
index 1531708..bf1b059 100644
--- a/net/test/spawned_test_server/local_test_server.cc
+++ b/net/test/spawned_test_server/local_test_server.cc
@@ -8,7 +8,7 @@
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/base/host_port_pair.h"
diff --git a/net/test/spawned_test_server/local_test_server.h b/net/test/spawned_test_server/local_test_server.h
index 8f79b8f..cfd2eb3 100644
--- a/net/test/spawned_test_server/local_test_server.h
+++ b/net/test/spawned_test_server/local_test_server.h
@@ -8,7 +8,7 @@
#include <string>
#include "base/file_util.h"
-#include "base/process.h"
+#include "base/process/process_handle.h"
#include "net/test/spawned_test_server/base_test_server.h"
#if defined(OS_WIN)
diff --git a/net/test/spawned_test_server/local_test_server_posix.cc b/net/test/spawned_test_server/local_test_server_posix.cc
index ac98c3c..10c2d0f 100644
--- a/net/test/spawned_test_server/local_test_server_posix.cc
+++ b/net/test/spawned_test_server/local_test_server_posix.cc
@@ -11,7 +11,9 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
+#include "base/process/process_iterator.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/test/test_timeouts.h"
diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc
index 2db8334..fd26483 100644
--- a/net/test/spawned_test_server/local_test_server_win.cc
+++ b/net/test/spawned_test_server/local_test_server_win.cc
@@ -13,7 +13,7 @@
#include "base/files/file_path.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/tools/crash_cache/crash_cache.cc b/net/tools/crash_cache/crash_cache.cc
index 6ebac5f..700e822 100644
--- a/net/tools/crash_cache/crash_cache.cc
+++ b/net/tools/crash_cache/crash_cache.cc
@@ -15,7 +15,9 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
+#include "base/process/process_handle.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/tools/dump_cache/dump_cache.cc b/net/tools/dump_cache/dump_cache.cc
index c5aed52..dd423b7 100644
--- a/net/tools/dump_cache/dump_cache.cc
+++ b/net/tools/dump_cache/dump_cache.cc
@@ -10,7 +10,6 @@
#include "base/at_exit.h"
#include "base/command_line.h"
-#include "base/process_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -19,6 +18,7 @@
#include "net/tools/dump_cache/simple_cache_dumper.h"
#if defined(OS_WIN)
+#include "base/process/launch.h"
#include "base/win/scoped_handle.h"
#include "net/tools/dump_cache/upgrade_win.h"
#endif
diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc
index ec678ff..9d5337c 100644
--- a/net/tools/tld_cleanup/tld_cleanup.cc
+++ b/net/tools/tld_cleanup/tld_cleanup.cc
@@ -31,7 +31,7 @@
#include "base/i18n/icu_util.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/memory.h"
#include "net/tools/tld_cleanup/tld_cleanup_util.h"
int main(int argc, const char* argv[]) {
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 7d9000b..796b913 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -15,7 +15,6 @@
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/path_service.h"
-#include "base/process_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 37e9cbb..d1b0cb4 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -20,7 +20,6 @@
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "base/process_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"