Fixing nacl-mounts breakages.

libraries/nacl-mounts/net/TcpSocket.h

 // Copyright (c) 2012 The Native Client 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 PACKAGES_LIBRARIES_NACL_MOUNTS_NET_SOCKET_H_
 #define PACKAGES_LIBRARIES_NACL_MOUNTS_NET_SOCKET_H_
 
 #include <deque>
 #include <queue>
 #include <vector>
 
 #include "../net/Socket.h"
 #include "../net/SocketSubSystem.h"
 #include "ppapi/cpp/completion_callback.h"
+#include "ppapi/utility/non_thread_safe_ref_count.h"

[jvoung - send to chromium..., 2012/08/21 16:37:28]

What I meant was that this header doesn't exist anymore at pepper tip, and has
been replaced by the thread traits.

 #include "../ppapi/cpp/private/tcp_socket_private.h"
 #include "../util/PthreadHelpers.h"
 
 class TCPSocket : public Socket {
  public:
   TCPSocket(SocketSubSystem* sys, int oflag);
   virtual ~TCPSocket();
 
   int oflag() { return oflag_; }
   bool is_block() { return !(oflag_ & O_NONBLOCK); }
@@ skipping 29 matching lines @@
 
   void Close(int32_t result, int32_t* pres);
 
   bool Accept(int32_t result, PP_Resource resource, int32_t* pres);
 
   static const size_t kBufSize = 64 * 1024;
 
   SocketSubSystem* sys_;
   int ref_;
   int oflag_;
-  pp::CompletionCallbackFactory<TCPSocket, ThreadSafeRefCount> factory_;
+  pp::CompletionCallbackFactory<TCPSocket, pp::NonThreadSafeRefCount> factory_;
   pp::TCPSocketPrivate* socket_;
   std::deque<char> in_buf_;
   std::vector<char> out_buf_;
   std::vector<char> read_buf_;
   std::vector<char> write_buf_;
   bool write_sent_;
 
   DISALLOW_COPY_AND_ASSIGN(TCPSocket);
 };
 
 #endif  // PACKAGES_LIBRARIES_NACL_MOUNTS_NET_SOCKET_H_