Revert 106717 - Revert 106677 (caused several PPAPI test timeouts, see http://crbug.com/101154)

ppapi/proxy/ppb_instance_proxy.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 PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
 
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
+#include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/interface_proxy.h"
+#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/shared_impl/instance_impl.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 
+// Windows headers interfere with this file.
+#ifdef PostMessage
+#undef PostMessage
+#endif
+
 namespace ppapi {
 namespace proxy {
 
 class SerializedVarReceiveInput;
 class SerializedVarOutParam;
 class SerializedVarReturnValue;
 
 class PPB_Instance_Proxy : public InterfaceProxy,
                            public ppapi::InstanceImpl,
                            public ppapi::thunk::PPB_Instance_FunctionAPI {
@@ skipping 64 matching lines @@
       PP_Instance instance,
       PP_URLComponents_Dev* components) OVERRIDE;
   virtual void PostMessage(PP_Instance instance, PP_Var message) OVERRIDE;
   virtual int32_t LockMouse(PP_Instance instance,
                             PP_CompletionCallback callback) OVERRIDE;
   virtual void UnlockMouse(PP_Instance instance) OVERRIDE;
 
   static const ApiID kApiID = API_ID_PPB_INSTANCE;
 
  private:
-  // Message handlers.
+  // Plugin -> Host message handlers.
   void OnMsgGetWindowObject(PP_Instance instance,
                             SerializedVarReturnValue result);
   void OnMsgGetOwnerElementObject(PP_Instance instance,
                                   SerializedVarReturnValue result);
   void OnMsgBindGraphics(PP_Instance instance,
                          const ppapi::HostResource& device,
                          PP_Bool* result);
   void OnMsgIsFullFrame(PP_Instance instance, PP_Bool* result);
   void OnMsgExecuteScript(PP_Instance instance,
                           SerializedVarReceiveInput script,
@@ skipping 20 matching lines @@
   void OnMsgFlashGetScreenSize(PP_Instance instance,
                                PP_Bool* result,
                                PP_Size* size);
   void OnMsgRequestInputEvents(PP_Instance instance,
                                bool is_filtering,
                                uint32_t event_classes);
   void OnMsgClearInputEvents(PP_Instance instance,
                              uint32_t event_classes);
   void OnMsgPostMessage(PP_Instance instance,
                         SerializedVarReceiveInput message);
-  void OnMsgLockMouse(PP_Instance instance,
-                      uint32_t serialized_callback);
+  void OnMsgLockMouse(PP_Instance instance);
   void OnMsgUnlockMouse(PP_Instance instance);
   void OnMsgResolveRelativeToDocument(PP_Instance instance,
                                       SerializedVarReceiveInput relative,
                                       SerializedVarReturnValue result);
   void OnMsgDocumentCanRequest(PP_Instance instance,
                                SerializedVarReceiveInput url,
                                PP_Bool* result);
   void OnMsgDocumentCanAccessDocument(PP_Instance active,
                                       PP_Instance target,
                                       PP_Bool* result);
   void OnMsgGetDocumentURL(PP_Instance instance,
                            SerializedVarReturnValue result);
   void OnMsgGetPluginInstanceURL(PP_Instance instance,
                                  SerializedVarReturnValue result);
+
+  // Host -> Plugin message handlers.
+  void OnMsgMouseLockComplete(PP_Instance instance, int32_t result);
+
+  void MouseLockCompleteInHost(int32_t result, PP_Instance instance);
+
+  pp::CompletionCallbackFactory<PPB_Instance_Proxy,
+                                ProxyNonThreadSafeRefCount> callback_factory_;
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_