diff options
-rw-r--r-- | chrome/browser/importer/firefox_importer_unittest_utils_mac.cc | 1 | ||||
-rw-r--r-- | chrome/nacl/nacl_broker_listener.cc | 1 | ||||
-rw-r--r-- | chrome/nacl/nacl_broker_listener.h | 6 | ||||
-rw-r--r-- | chrome/nacl/nacl_ipc_adapter.cc | 1 | ||||
-rw-r--r-- | chrome/nacl/nacl_ipc_adapter.h | 7 | ||||
-rw-r--r-- | content/renderer/gpu/stream_texture_host_android.h | 2 | ||||
-rw-r--r-- | content/test/webrtc_audio_device_test.h | 6 | ||||
-rw-r--r-- | ipc/ipc_channel.h | 4 | ||||
-rw-r--r-- | ipc/ipc_channel_win.cc | 1 | ||||
-rw-r--r-- | ipc/ipc_send_fds_test.cc | 3 | ||||
-rw-r--r-- | ipc/ipc_test_sink.cc | 1 | ||||
-rw-r--r-- | ppapi/proxy/resource_message_test_sink.h | 1 |
12 files changed, 23 insertions, 11 deletions
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index cee97c3..077571a 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -14,6 +14,7 @@ #include "chrome/browser/importer/firefox_importer_utils.h" #include "ipc/ipc_channel.h" #include "ipc/ipc_descriptors.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" #include "ipc/ipc_multiprocess_test.h" #include "ipc/ipc_switches.h" diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc index 1bb42d6b..135997c 100644 --- a/chrome/nacl/nacl_broker_listener.cc +++ b/chrome/nacl/nacl_broker_listener.cc @@ -16,6 +16,7 @@ #include "chrome/common/nacl_messages.h" #include "content/public/common/content_switches.h" #include "content/public/common/sandbox_init.h" +#include "ipc/ipc_channel.h" #include "ipc/ipc_switches.h" namespace { diff --git a/chrome/nacl/nacl_broker_listener.h b/chrome/nacl/nacl_broker_listener.h index 56f50be..6ebc179 100644 --- a/chrome/nacl/nacl_broker_listener.h +++ b/chrome/nacl/nacl_broker_listener.h @@ -8,7 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "base/process.h" #include "chrome/common/nacl_types.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" + +namespace IPC { +class Channel; +} // The BrokerThread class represents the thread that handles the messages from // the browser process and starts NaCl loader processes. diff --git a/chrome/nacl/nacl_ipc_adapter.cc b/chrome/nacl/nacl_ipc_adapter.cc index 1ee0c37..2bbaa1f 100644 --- a/chrome/nacl/nacl_ipc_adapter.cc +++ b/chrome/nacl/nacl_ipc_adapter.cc @@ -13,6 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" #include "build/build_config.h" +#include "ipc/ipc_channel.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_platform_file.h" #include "native_client/src/trusted/desc/nacl_desc_custom.h" diff --git a/chrome/nacl/nacl_ipc_adapter.h b/chrome/nacl/nacl_ipc_adapter.h index 3752139..f9db3dc 100644 --- a/chrome/nacl/nacl_ipc_adapter.h +++ b/chrome/nacl/nacl_ipc_adapter.h @@ -13,19 +13,20 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "base/pickle.h" #include "base/shared_memory.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/task_runner.h" -#include "ipc/ipc_channel.h" -#include "ipc/ipc_message.h" +#include "ipc/ipc_listener.h" struct NaClDesc; struct NaClImcTypedMsgHdr; struct PP_Size; namespace IPC { -class Message; +class Channel; +struct ChannelHandle; } namespace nacl { diff --git a/content/renderer/gpu/stream_texture_host_android.h b/content/renderer/gpu/stream_texture_host_android.h index 74d40c4..3fd184c 100644 --- a/content/renderer/gpu/stream_texture_host_android.h +++ b/content/renderer/gpu/stream_texture_host_android.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "content/common/android/surface_texture_peer.h" -#include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" namespace gfx { diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h index 31a57da..56137192 100644 --- a/content/test/webrtc_audio_device_test.h +++ b/content/test/webrtc_audio_device_test.h @@ -13,11 +13,15 @@ #include "base/message_loop.h" #include "content/browser/renderer_host/media/mock_media_observer.h" #include "content/public/renderer/content_renderer_client.h" +#include "ipc/ipc_listener.h" #include "media/base/channel_layout.h" -#include "ipc/ipc_channel.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/webrtc/common_types.h" +namespace IPC { +class Channel; +} + namespace media { class AudioManager; } diff --git a/ipc/ipc_channel.h b/ipc/ipc_channel.h index 500dcf7..e86fc35 100644 --- a/ipc/ipc_channel.h +++ b/ipc/ipc_channel.h @@ -17,10 +17,6 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_sender.h" -// TODO(brettw) remove this and update files that depend on this being included -// from here. -#include "ipc/ipc_listener.h" - namespace IPC { class Listener; diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc index 3cc1c6e..6fb4416 100644 --- a/ipc/ipc_channel_win.cc +++ b/ipc/ipc_channel_win.cc @@ -16,6 +16,7 @@ #include "base/threading/thread_checker.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message_utils.h" diff --git a/ipc/ipc_send_fds_test.cc b/ipc/ipc_send_fds_test.cc index eeee56b..6679088 100644 --- a/ipc/ipc_send_fds_test.cc +++ b/ipc/ipc_send_fds_test.cc @@ -17,6 +17,7 @@ extern "C" { #include "base/message_loop.h" #include "base/posix/eintr_wrapper.h" #include "ipc/ipc_channel.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message_utils.h" #include "ipc/ipc_multiprocess_test.h" #include "testing/multiprocess_func_list.h" @@ -81,7 +82,7 @@ class MyChannelDescriptorListener : public IPC::Listener { unsigned num_fds_received_; }; -void TestDescriptorServer(IPC::Channel &chan, +void TestDescriptorServer(IPC::Channel& chan, base::ProcessHandle process_handle) { ASSERT_TRUE(process_handle); diff --git a/ipc/ipc_test_sink.cc b/ipc/ipc_test_sink.cc index 2dc8898..070fe12 100644 --- a/ipc/ipc_test_sink.cc +++ b/ipc/ipc_test_sink.cc @@ -4,6 +4,7 @@ #include "ipc/ipc_test_sink.h" +#include "ipc/ipc_listener.h" #include "ipc/ipc_message.h" namespace IPC { diff --git a/ppapi/proxy/resource_message_test_sink.h b/ppapi/proxy/resource_message_test_sink.h index 7694fb0..f5f97cf 100644 --- a/ppapi/proxy/resource_message_test_sink.h +++ b/ppapi/proxy/resource_message_test_sink.h @@ -5,6 +5,7 @@ #ifndef PPAPI_PROXY_RESOURCE_MESSAGE_TEST_SINK_H_ #define PPAPI_PROXY_RESOURCE_MESSAGE_TEST_SINK_H_ +#include "ipc/ipc_listener.h" #include "ipc/ipc_test_sink.h" #include "ppapi/c/pp_stdint.h" |