Fix a race condition in the Java Bridge when adding objects

content/renderer/java/java_bridge_dispatcher.h

 // Copyright (c) 2011 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_RENDERER_JAVA_JAVA_BRIDGE_DISPATCHER_H_
 #define CONTENT_RENDERER_JAVA_JAVA_BRIDGE_DISPATCHER_H_
 
 #include "content/public/common/webkit_param_traits.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "ipc/ipc_channel_handle.h"
 
 class JavaBridgeChannel;
 
 // This class handles injecting Java objects into the main frame of a
 // RenderView. The 'add' and 'remove' messages received from the browser
 // process modify the entries in a map of 'pending' objects. These objects are
 // bound to the window object of the main frame when that window object is next
 // cleared. These objects remain bound until the window object is cleared
 // again.
 class JavaBridgeDispatcher : public content::RenderViewObserver {
  public:
-  JavaBridgeDispatcher(content::RenderView* render_view,
-                       const IPC::ChannelHandle& channel_handle);
+  JavaBridgeDispatcher(content::RenderView* render_view);
   virtual ~JavaBridgeDispatcher();
 
  private:
   // RenderViewObserver override:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE;
 
   // Message handlers
   void OnAddNamedObject(const string16& name,
                         const NPVariant_Param& variant_param);
   void OnRemoveNamedObject(const string16& name);
 
+  void EnsureChannelIsSetUp();
+
   // Objects that will be bound to the window when the window object is next
   // cleared. We hold a ref to these.
   typedef std::map<string16, NPVariant> ObjectMap;
   ObjectMap objects_;
   scoped_ptr<JavaBridgeChannel> channel_;
 };
 
 #endif  // CONTENT_RENDERER_JAVA_JAVA_BRIDGE_DISPATCHER_H_