2 files changed, 2 insertions, 12 deletions
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc
index c7b488a..5d61738 100644
--- a/chrome/common/child_thread.cc
+++ b/chrome/common/child_thread.cc
@@ -24,8 +24,7 @@ ChildThread::ChildThread() {
 }
 
 ChildThread::ChildThread(const std::string& channel_name)
-    : channel_name_(channel_name),
-      on_channel_error_called_(false) {
+    : channel_name_(channel_name) {
   Init();
 }
 
@@ -72,7 +71,6 @@ ChildThread::~ChildThread() {
 }
 
 void ChildThread::OnChannelError() {
-  set_on_channel_error_called(true);
   MessageLoop::current()->Quit();
 }
 
@@ -162,7 +160,7 @@ ChildThread* ChildThread::current() {
 }
 
 void ChildThread::OnProcessFinalRelease() {
-  if (on_channel_error_called_ || !check_with_browser_before_shutdown_) {
+  if (!check_with_browser_before_shutdown_) {
     MessageLoop::current()->Quit();
     return;
   }
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index ee05e11..2b55417 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -70,10 +70,6 @@ class ChildThread : public IPC::Channel::Listener,
 
   IPC::SyncChannel* channel() { return channel_.get(); }
 
-  void set_on_channel_error_called(bool on_channel_error_called) {
-    on_channel_error_called_ = on_channel_error_called;
-  }
-
  private:
   void Init();
 
@@ -98,10 +94,6 @@ class ChildThread : public IPC::Channel::Listener,
   // that would addref it.
   bool check_with_browser_before_shutdown_;
 
-  // The OnChannelError() callback was invoked - the channel is dead, don't
-  // attempt to communicate.
-  bool on_channel_error_called_;
-
   MessageLoop* message_loop_;
 
   scoped_ptr<NotificationService> notification_service_;