Merge (7265, 7271] from bleeding_edge to experimental/gc branch....

test/cctest/test-sockets.cc

Index: test/cctest/test-sockets.cc
===================================================================
--- test/cctest/test-sockets.cc	(revision 7563)
+++ test/cctest/test-sockets.cc	(working copy)
@@ -10,9 +10,9 @@
 
 class SocketListenerThread : public Thread {
  public:
-  explicit SocketListenerThread(int port, int data_size)
-      : port_(port), data_size_(data_size), server_(NULL), client_(NULL),
-        listening_(OS::CreateSemaphore(0)) {
+  explicit SocketListenerThread(Isolate* isolate, int port, int data_size)
+      : Thread(isolate), port_(port), data_size_(data_size), server_(NULL),
+        client_(NULL), listening_(OS::CreateSemaphore(0)) {
     data_ = new char[data_size_];
   }
   ~SocketListenerThread() {
@@ -88,7 +88,8 @@
   OS::SNPrintF(Vector<char>(port_str, kPortBuferLen), "%d", port);
 
   // Create a socket listener.
-  SocketListenerThread* listener = new SocketListenerThread(port, len);
+  SocketListenerThread* listener = new SocketListenerThread(Isolate::Current(),
+      port, len);
   listener->Start();
   listener->WaitForListening();