Ensure that PP_Instance values are unique within a plugin process in addition...

ppapi/proxy/dispatcher.cc

 // 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.
 
 #include "ppapi/proxy/dispatcher.h"
 
 #include <string.h>  // For memset.
 
 #include <map>
 
@@ skipping 147 matching lines @@
 
 // static
 InterfaceList* InterfaceList::GetInstance() {
   return Singleton<InterfaceList>::get();
 }
 
 }  // namespace
 
 Dispatcher::Dispatcher(base::ProcessHandle remote_process_handle,
                        GetInterfaceFunc local_get_interface)
-    : remote_process_handle_(remote_process_handle),
+    : delegate_(NULL),
+      remote_process_handle_(remote_process_handle),
       test_sink_(NULL),
       disallow_trusted_interfaces_(false),  // TODO(brettw) make this settable.
       local_get_interface_(local_get_interface),
       callback_tracker_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 Dispatcher::~Dispatcher() {
 }
 
-bool Dispatcher::InitWithChannel(MessageLoop* ipc_message_loop,
+bool Dispatcher::InitWithChannel(Delegate* delegate,
                                  const IPC::ChannelHandle& channel_handle,
-                                 bool is_client,
-                                 base::WaitableEvent* shutdown_event) {
+                                 bool is_client) {
   IPC::Channel::Mode mode = is_client ? IPC::Channel::MODE_CLIENT
                                       : IPC::Channel::MODE_SERVER;
   channel_.reset(new IPC::SyncChannel(channel_handle, mode, this,
-                                      ipc_message_loop, false, shutdown_event));
+                                      delegate->GetIPCMessageLoop(), false,
+                                      delegate->GetShutdownEvent()));
   return true;
 }
 
 void Dispatcher::InitWithTestSink(IPC::TestSink* test_sink) {
   DCHECK(!test_sink_);
   test_sink_ = test_sink;
 }
 
 bool Dispatcher::OnMessageReceived(const IPC::Message& msg) {
   // Control messages.
@@ skipping 94 matching lines @@
     return channel_->Send(msg);
 
   // Remote side crashed, drop this message.
   delete msg;
   return false;
 }
 
 }  // namespace proxy
 }  // namespace pp