1 files changed, 11 insertions, 13 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
index 19e15d7b3..a023766f6 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
@@ -26,7 +26,7 @@
 #ifndef PluginProcessConnectionManager_h
 #define PluginProcessConnectionManager_h
 
-#if ENABLE(PLUGIN_PROCESS)
+#if ENABLE(NETSCAPE_PLUGIN_API)
 
 #include "PluginProcess.h"
 #include <wtf/Forward.h>
@@ -42,36 +42,34 @@ namespace WebKit {
 
 class PluginProcessConnection;
         
-class PluginProcessConnectionManager : public CoreIPC::Connection::WorkQueueMessageReceiver {
+class PluginProcessConnectionManager : public IPC::Connection::WorkQueueMessageReceiver {
 public:
-    static PassRefPtr<PluginProcessConnectionManager> create();
+    static Ref<PluginProcessConnectionManager> create();
     ~PluginProcessConnectionManager();
 
-    void initializeConnection(CoreIPC::Connection*);
+    void initializeConnection(IPC::Connection*);
 
     PluginProcessConnection* getPluginProcessConnection(uint64_t pluginProcessToken);
     void removePluginProcessConnection(PluginProcessConnection*);
 
-    void didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(CoreIPC::Connection*, OwnPtr<CoreIPC::MessageDecoder>&);
-
 private:
     PluginProcessConnectionManager();
 
-    // CoreIPC::Connection::WorkQueueMessageReceiver.
-    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+    // IPC::Connection::WorkQueueMessageReceiver.
+    virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
 
     void pluginProcessCrashed(uint64_t pluginProcessToken);
 
-    RefPtr<WorkQueue> m_queue;
+    Ref<WorkQueue> m_queue;
 
-    Vector<RefPtr<PluginProcessConnection> > m_pluginProcessConnections;
+    Vector<RefPtr<PluginProcessConnection>> m_pluginProcessConnections;
 
-    Mutex m_tokensAndConnectionsMutex;
-    HashMap<uint64_t, RefPtr<CoreIPC::Connection> > m_tokensAndConnections;
+    Lock m_tokensAndConnectionsMutex;
+    HashMap<uint64_t, RefPtr<IPC::Connection>> m_tokensAndConnections;
 };
 
 }
 
-#endif // ENABLE(PLUGIN_PROCESS)
+#endif // ENABLE(NETSCAPE_PLUGIN_API)
 
 #endif // PluginProcessConnectionManager_h