Revert r21117 as it caused reliability failures....

chrome/renderer/render_process.h

 // Copyright (c) 2006-2008 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 CHROME_RENDERER_RENDER_PROCESS_H__
 #define CHROME_RENDERER_RENDER_PROCESS_H__
 
 #include "base/timer.h"
 #include "chrome/common/child_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace gfx {
 class Rect;
 }
 
 class TransportDIB;
 
 // Represents the renderer end of the browser<->renderer connection. The
 // opposite end is the RenderProcessHost. This is a singleton object for
 // each renderer.
 class RenderProcess : public ChildProcess {
  public:
+  // This constructor grabs the channel name from the command line arguments.
   RenderProcess();
+  // This constructor uses the given channel name.
+  RenderProcess(const std::string& channel_name);
+
   ~RenderProcess();
 
   // Get a canvas suitable for drawing and transporting to the browser
   //   memory: (output) the transport DIB memory
   //   rect: the rectangle which will be painted, use for sizing the canvas
   //   returns: NULL on error
   //
   // When no longer needed, you should pass the TransportDIB to
   // ReleaseTransportDIB so that it can be recycled.
   skia::PlatformCanvas* GetDrawingCanvas(
       TransportDIB** memory, const gfx::Rect& rect);
 
   // Frees shared memory allocated by AllocSharedMemory.  You should only use
   // this function to free the SharedMemory object.
   void ReleaseTransportDIB(TransportDIB* memory);
 
   // Returns true if plugins should be loaded in-process.
   bool in_process_plugins() const { return in_process_plugins_; }
 
   bool initialized_media_library() const { return initialized_media_library_; }
 
   // Returns a pointer to the RenderProcess singleton instance.
   static RenderProcess* current() {
     return static_cast<RenderProcess*>(ChildProcess::current());
   }
 
+ protected:
+  friend class RenderThread;
   // Just like in_process_plugins(), but called before RenderProcess is created.
   static bool InProcessPlugins();
 
  private:
+  void Init();
+
   // Look in the shared memory cache for a suitable object to reuse.
   //   result: (output) the memory found
   //   size: the resulting memory will be >= this size, in bytes
   //   returns: false if a suitable DIB memory could not be found
   bool GetTransportDIBFromCache(TransportDIB** result, size_t size);
 
   // Maybe put the given shared memory into the shared memory cache. Returns
   // true if the SharedMemory object was stored in the cache; otherwise, false
   // is returned.
   bool PutSharedMemInCache(TransportDIB* memory);
@@ skipping 20 matching lines @@
   // TransportDIB sequence number
   uint32 sequence_number_;
 
   bool in_process_plugins_;
   bool initialized_media_library_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderProcess);
 };
 
 #endif  // CHROME_RENDERER_RENDER_PROCESS_H__