Ensure we don't have zombie child processes that get started but never get a chance to connect to t…

content/common/child_thread.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_COMMON_CHILD_THREAD_H_
 #define CONTENT_COMMON_CHILD_THREAD_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/shared_memory.h"
 #include "base/tracked_objects.h"
 #include "content/common/content_export.h"
 #include "content/common/message_router.h"
 #include "ipc/ipc_message.h"  // For IPC_MESSAGE_LOG_ENABLED.
 #include "webkit/glue/resource_loader_bridge.h"
 
 class FileSystemDispatcher;
 class MessageLoop;
 class QuotaDispatcher;
@@ skipping 73 matching lines @@
 
   virtual bool IsWebFrameValid(WebKit::WebFrame* frame);
 
  protected:
   friend class ChildProcess;
 
   // Called when the process refcount is 0.
   void OnProcessFinalRelease();
 
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
-  virtual void OnShutdown();
-
-#ifdef IPC_MESSAGE_LOG_ENABLED
-  virtual void OnSetIPCLoggingEnabled(bool enable);
-#endif
-
-  virtual void OnSetProfilerStatus(tracked_objects::ThreadData::Status status);
-  virtual void OnGetChildProfilerData(int sequence_number);
-
-  virtual void OnDumpHandles();
 
   void set_on_channel_error_called(bool on_channel_error_called) {
     on_channel_error_called_ = on_channel_error_called;
   }
 
   // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
  private:
   void Init();
 
+  // IPC message handlers.
+  void OnShutdown();
+  void OnSetProfilerStatus(tracked_objects::ThreadData::Status status);
+  void OnGetChildProfilerData(int sequence_number);
+  void OnDumpHandles();
+#ifdef IPC_MESSAGE_LOG_ENABLED
+  void OnSetIPCLoggingEnabled(bool enable);
+#endif
 #if defined(USE_TCMALLOC)
   void OnGetTcmallocStats();
 #endif
 
+  void EnsureConnected();
+
   std::string channel_name_;
   scoped_ptr<IPC::SyncChannel> channel_;
 
   // Allows threads other than the main thread to send sync messages.
   scoped_refptr<IPC::SyncMessageFilter> sync_message_filter_;
 
   // Implements message routing functionality to the consumers of ChildThread.
   MessageRouter router_;
 
   // Handles resource loads for this process.
   scoped_ptr<content::ResourceDispatcher> resource_dispatcher_;
 
   // Handles SocketStream for this process.
   scoped_ptr<SocketStreamDispatcher> socket_stream_dispatcher_;
 
   // The OnChannelError() callback was invoked - the channel is dead, don't
   // attempt to communicate.
   bool on_channel_error_called_;
 
   MessageLoop* message_loop_;
 
   scoped_ptr<FileSystemDispatcher> file_system_dispatcher_;
 
   scoped_ptr<QuotaDispatcher> quota_dispatcher_;
 
   scoped_refptr<content::ChildHistogramMessageFilter> histogram_message_filter_;
 
+  base::WeakPtrFactory<ChildThread> channel_connected_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ChildThread);
 };
 
 #endif  // CONTENT_COMMON_CHILD_THREAD_H_