summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 14:59:22 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-23 14:59:22 +0000
commit6a62229511adabc4228c994f685dd2980b2feabf (patch)
treecafc759426f979c6339373ed5533b9bab2d0769e /chrome_frame
parentc17c64f0d4fa8e4db97431efaf339f9ff61b5f1a (diff)
downloadchromium_src-6a62229511adabc4228c994f685dd2980b2feabf.zip
chromium_src-6a62229511adabc4228c994f685dd2980b2feabf.tar.gz
chromium_src-6a62229511adabc4228c994f685dd2980b2feabf.tar.bz2
Update include paths in chrome_frame for base/process changes.
BUG=242290 R=robertshield@chromium.org Review URL: https://codereview.chromium.org/19526005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/buggy_bho_handling.cc2
-rw-r--r--chrome_frame/chrome_frame_activex.cc1
-rw-r--r--chrome_frame/chrome_frame_automation.cc2
-rw-r--r--chrome_frame/chrome_frame_unittest_main.cc4
-rw-r--r--chrome_frame/chrome_tab.cc1
-rw-r--r--chrome_frame/ready_mode/internal/registry_ready_mode_state.cc2
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.cc7
-rw-r--r--chrome_frame/test/chrome_frame_test_utils.h2
-rw-r--r--chrome_frame/test/html_util_unittests.cc1
-rw-r--r--chrome_frame/test/net/fake_external_tab.h2
-rw-r--r--chrome_frame/test/perf/chrome_frame_perftest.cc6
-rw-r--r--chrome_frame/test/perf/run_all.cc1
-rw-r--r--chrome_frame/test/reliability/run_all_unittests.cc1
-rw-r--r--chrome_frame/test/run_all_unittests.cc3
-rw-r--r--chrome_frame/test/simulate_input.h2
-rw-r--r--chrome_frame/test/test_scrubber.cc2
-rw-r--r--chrome_frame/test/test_with_web_server.cc1
-rw-r--r--chrome_frame/test_utils.cc3
-rw-r--r--chrome_frame/turndown_prompt/turndown_prompt.cc2
19 files changed, 28 insertions, 17 deletions
diff --git a/chrome_frame/buggy_bho_handling.cc b/chrome_frame/buggy_bho_handling.cc
index fef41f4..491bae5 100644
--- a/chrome_frame/buggy_bho_handling.cc
+++ b/chrome_frame/buggy_bho_handling.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/memory.h"
#include "base/win/scoped_comptr.h"
#include "chrome_frame/exception_barrier.h"
#include "chrome_frame/function_stub.h"
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index b99ba0b..9a76b78 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -15,7 +15,6 @@
#include "base/logging.h"
#include "base/memory/singleton.h"
#include "base/path_service.h"
-#include "base/process_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 4735e64..bcf4f06 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -14,7 +14,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
diff --git a/chrome_frame/chrome_frame_unittest_main.cc b/chrome_frame/chrome_frame_unittest_main.cc
index 14042b0..f8be06e 100644
--- a/chrome_frame/chrome_frame_unittest_main.cc
+++ b/chrome_frame/chrome_frame_unittest_main.cc
@@ -4,9 +4,11 @@
#include <atlbase.h>
#include <atlcom.h>
+
#include "base/at_exit.h"
#include "base/command_line.h"
-#include "base/process.h"
+#include "base/process/kill.h"
+#include "base/process/process.h"
#include "chrome_frame/crash_server_init.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "gtest/gtest.h"
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 8728c95..6ddfd49 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -18,6 +18,7 @@
#include "base/logging.h"
#include "base/logging_win.h"
#include "base/path_service.h"
+#include "base/process/launch.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
index 4ff419d..0a66e7d 100644
--- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
+++ b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc
@@ -7,7 +7,7 @@
#include <windows.h>
#include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/time/time.h"
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index ff0e6ef..6041030 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -9,6 +9,7 @@
#include <iepmapi.h>
#include <sddl.h>
#include <shlobj.h>
+#include <TlHelp32.h>
#include <winsock2.h>
#include "base/command_line.h"
@@ -17,8 +18,10 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/process.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
+#include "base/process/process.h"
+#include "base/process/process_iterator.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 926143a..f9c08e2 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -18,7 +18,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
#include "base/run_loop.h"
#include "base/test/test_reg_util_win.h"
#include "base/time/time.h"
diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc
index b9af356..5431f1e 100644
--- a/chrome_frame/test/html_util_unittests.cc
+++ b/chrome_frame/test/html_util_unittests.cc
@@ -14,7 +14,6 @@
#include "base/memory/scoped_handle.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "base/process_util.h"
#include "base/strings/utf_string_conversions.h"
#include "net/base/net_util.h"
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index bf0ebc8..f4dac94 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -10,7 +10,7 @@
#include "base/cancelable_callback.h"
#include "base/files/file_path.h"
#include "base/message_loop/message_loop.h"
-#include "base/process.h"
+#include "base/process/process.h"
#include "base/win/scoped_handle.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome_frame/test/net/test_automation_provider.h"
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index f068264..443d441 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "chrome_frame/test/perf/chrome_frame_perftest.h"
-#include <atlwin.h>
#include <atlhost.h>
+#include <atlwin.h>
#include <map>
#include <string>
@@ -15,7 +15,9 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.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_iterator.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/chrome_frame/test/perf/run_all.cc b/chrome_frame/test/perf/run_all.cc
index c6ff9fa..f4945e3 100644
--- a/chrome_frame/test/perf/run_all.cc
+++ b/chrome_frame/test/perf/run_all.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "base/memory/scoped_ptr.h"
+#include "base/process/kill.h"
#include "base/test/perf_test_suite.h"
#include "base/threading/platform_thread.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome_frame/test/reliability/run_all_unittests.cc b/chrome_frame/test/reliability/run_all_unittests.cc
index d1572aa..72b8ef8 100644
--- a/chrome_frame/test/reliability/run_all_unittests.cc
+++ b/chrome_frame/test/reliability/run_all_unittests.cc
@@ -5,6 +5,7 @@
#include "chrome_frame/test/reliability/reliability_test_suite.h"
#include "base/command_line.h"
+#include "base/process/kill.h"
#include "chrome/common/chrome_paths.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/test_utils.h"
diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc
index f9b7335..97fb40b 100644
--- a/chrome_frame/test/run_all_unittests.cc
+++ b/chrome_frame/test/run_all_unittests.cc
@@ -5,7 +5,8 @@
#include <atlbase.h>
#include "base/command_line.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/memory.h"
#include "base/test/test_suite.h"
#include "base/threading/platform_thread.h"
#include "base/win/scoped_com_initializer.h"
diff --git a/chrome_frame/test/simulate_input.h b/chrome_frame/test/simulate_input.h
index 97f7e0e..7992768 100644
--- a/chrome_frame/test/simulate_input.h
+++ b/chrome_frame/test/simulate_input.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/process_util.h"
+#include "base/process/process_handle.h"
namespace simulate_input {
diff --git a/chrome_frame/test/test_scrubber.cc b/chrome_frame/test/test_scrubber.cc
index dc8902c..8881a8b 100644
--- a/chrome_frame/test/test_scrubber.cc
+++ b/chrome_frame/test/test_scrubber.cc
@@ -15,7 +15,7 @@
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_process_killer_win.h"
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index b002022..68df297 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -10,6 +10,7 @@
#include "base/files/memory_mapped_file.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
+#include "base/process/kill.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_timeouts.h"
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index a473732..ef78046 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -15,7 +15,8 @@
#include "base/files/file_path.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/kill.h"
+#include "base/process/launch.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/scoped_handle.h"
diff --git a/chrome_frame/turndown_prompt/turndown_prompt.cc b/chrome_frame/turndown_prompt/turndown_prompt.cc
index 4d26a2f..513852a 100644
--- a/chrome_frame/turndown_prompt/turndown_prompt.cc
+++ b/chrome_frame/turndown_prompt/turndown_prompt.cc
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/process_util.h"
+#include "base/process/launch.h"
#include "base/win/scoped_bstr.h"
#include "base/win/scoped_comptr.h"
#include "base/win/win_util.h"