Decouple IPC::MessageFilter from IPC::Channel

content/child/child_thread.cc

Index: content/child/child_thread.cc
diff --git a/content/child/child_thread.cc b/content/child/child_thread.cc
index 5e77c4046bec7deb5396eacb3671da1bc0b50dc4..46bb327d245d99f0ca2d86409f1895f542dc3d98 100644
--- a/content/child/child_thread.cc
+++ b/content/child/child_thread.cc
@@ -111,16 +111,16 @@ bool CreateWaitAndExitThread(base::TimeDelta duration) {
 }
 #endif
 
-class SuicideOnChannelErrorFilter : public IPC::MessageFilter {
+class SuicideOnSenderErrorFilter : public IPC::MessageFilter {
  public:
   // IPC::MessageFilter
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnSenderError() OVERRIDE {
     // For renderer/worker processes:
     // On POSIX, at least, one can install an unload handler which loops
     // forever and leave behind a renderer process which eats 100% CPU forever.
     //
     // This is because the terminate signals (ViewMsg_ShouldClose and the error
-    // from the IPC channel) are routed to the main message loop but never
+    // from the IPC sender) are routed to the main message loop but never
     // processed (because that message loop is stuck in V8).
     //
     // One could make the browser SIGKILL the renderers, but that leaves open a
@@ -128,7 +128,7 @@ class SuicideOnChannelErrorFilter : public IPC::MessageFilter {
     // the browser because "it's stuck") will leave behind a process eating all
     // the CPU.
     //
-    // So, we install a filter on the channel so that we can process this event
+    // So, we install a filter on the sender so that we can process this event
     // here and kill the process.
     // TODO(earthdok): Re-enable on CrOS http://crbug.com/360622
 #if (defined(ADDRESS_SANITIZER) || defined(LEAK_SANITIZER) || \
@@ -148,7 +148,7 @@ class SuicideOnChannelErrorFilter : public IPC::MessageFilter {
   }
 
  protected:
-  virtual ~SuicideOnChannelErrorFilter() {}
+  virtual ~SuicideOnSenderErrorFilter() {}
 };
 
 #endif  // OS(POSIX)
@@ -286,7 +286,7 @@ void ChildThread::Init() {
   // Check that --process-type is specified so we don't do this in unit tests
   // and single-process mode.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessType))
-    channel_->AddFilter(new SuicideOnChannelErrorFilter());
+    channel_->AddFilter(new SuicideOnSenderErrorFilter());
 #endif
 
   base::MessageLoop::current()->PostDelayedTask(