Remove WebWaitableEvent and replace it with WaitableEvent.

third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/fileapi/Blob.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerThread.h"
 #include "modules/websockets/DocumentWebSocketChannel.h"
+#include "platform/WaitableEvent.h"
 #include "platform/heap/SafePoint.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebWaitableEvent.h"
 #include "wtf/Assertions.h"
 #include "wtf/Functional.h"
 #include "wtf/MainThread.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 typedef WorkerWebSocketChannel::Bridge Bridge;
 typedef WorkerWebSocketChannel::Peer Peer;
 
 // Created and destroyed on the worker thread. All setters of this class are
 // called on the main thread, while all getters are called on the worker
 // thread. signalWorkerThread() must be called before any getters are called.
 class WebSocketChannelSyncHelper : public GarbageCollectedFinalized<WebSocketChannelSyncHelper> {
 public:
-    static WebSocketChannelSyncHelper* create(PassOwnPtr<WebWaitableEvent> event)
+    static WebSocketChannelSyncHelper* create(PassOwnPtr<WaitableEvent> event)
     {
         return new WebSocketChannelSyncHelper(event);
     }
 
     ~WebSocketChannelSyncHelper()
     {
     }
 
     // All setters are called on the main thread.
     void setConnectRequestResult(bool connectRequestResult)
@@ skipping 14 matching lines @@
         m_event->signal();
     }
     void wait()
     {
         m_event->wait();
     }
 
     DEFINE_INLINE_TRACE() { }
 
 private:
-    explicit WebSocketChannelSyncHelper(PassOwnPtr<WebWaitableEvent> event)
+    explicit WebSocketChannelSyncHelper(PassOwnPtr<WaitableEvent> event)
         : m_event(event)
         , m_connectRequestResult(false)
     {
     }
 
-    OwnPtr<WebWaitableEvent> m_event;
+    OwnPtr<WaitableEvent> m_event;
     bool m_connectRequestResult;
 };
 
 WorkerWebSocketChannel::WorkerWebSocketChannel(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber)
     : m_bridge(new Bridge(client, workerGlobalScope))
     , m_sourceURLAtConnection(sourceURL)
     , m_lineNumberAtConnection(lineNumber)
 {
     m_bridge->initialize(sourceURL, lineNumber);
 }
@@ skipping 251 matching lines @@
     visitor->trace(m_bridge);
     visitor->trace(m_mainWebSocketChannel);
     visitor->trace(m_syncHelper);
     WebSocketChannelClient::trace(visitor);
 }
 
 Bridge::Bridge(WebSocketChannelClient* client, WorkerGlobalScope& workerGlobalScope)
     : m_client(client)
     , m_workerGlobalScope(workerGlobalScope)
     , m_loaderProxy(m_workerGlobalScope->thread()->workerLoaderProxy())
-    , m_syncHelper(WebSocketChannelSyncHelper::create(adoptPtr(Platform::current()->createWaitableEvent())))
+    , m_syncHelper(WebSocketChannelSyncHelper::create(adoptPtr(new WaitableEvent())))
     , m_peer(new Peer(this, m_loaderProxy, m_syncHelper))
 {
 }
 
 Bridge::~Bridge()
 {
     ASSERT(!m_peer);
 }
 
 void Bridge::initialize(const String& sourceURL, unsigned lineNumber)
@@ skipping 88 matching lines @@
 
 DEFINE_TRACE(Bridge)
 {
     visitor->trace(m_client);
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_syncHelper);
     visitor->trace(m_peer);
 }
 
 } // namespace blink