EDK: Move ref counting classes to mojo/edk/util.

mojo/edk/system/channel_endpoint.h

Index: mojo/edk/system/channel_endpoint.h
diff --git a/mojo/edk/system/channel_endpoint.h b/mojo/edk/system/channel_endpoint.h
index af537e5890153d6ca75424ae9ffd13bca22a8ec4..4a720f233a07d9638bd67a23f8650dd4ff980d8c 100644
--- a/mojo/edk/system/channel_endpoint.h
+++ b/mojo/edk/system/channel_endpoint.h
@@ -10,8 +10,8 @@
 #include "mojo/edk/system/channel_endpoint_id.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
 #include "mojo/edk/system/mutex.h"
-#include "mojo/edk/system/ref_counted.h"
-#include "mojo/edk/system/ref_ptr.h"
+#include "mojo/edk/util/ref_counted.h"
+#include "mojo/edk/util/ref_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
@@ -109,9 +109,10 @@ class MessageInTransit;
 //         simultaneously, and both sides send "remove" messages). In that
 //         case, it must still remain alive until it receives the "remove
 //         ack" (and it must ack the "remove" message that it received).
-class ChannelEndpoint final : public RefCountedThreadSafe<ChannelEndpoint> {
+class ChannelEndpoint final
+    : public util::RefCountedThreadSafe<ChannelEndpoint> {
  public:
-  // Note: Use |MakeRefCounted<ChannelEndpoint>()|.
+  // Note: Use |util::MakeRefCounted<ChannelEndpoint>()|.
 
   // Methods called by |ChannelEndpointClient|:
 
@@ -127,7 +128,7 @@ class ChannelEndpoint final : public RefCountedThreadSafe<ChannelEndpoint> {
   // This returns true in the typical case, and false if this endpoint has been
   // detached from the channel, in which case the caller should probably call
   // its (new) client's |OnDetachFromChannel()|.
-  bool ReplaceClient(RefPtr<ChannelEndpointClient>&& client,
+  bool ReplaceClient(util::RefPtr<ChannelEndpointClient>&& client,
                      unsigned client_port);
 
   // Called before the |ChannelEndpointClient| gives up its reference to this
@@ -161,7 +162,7 @@ class ChannelEndpoint final : public RefCountedThreadSafe<ChannelEndpoint> {
   // in which case |message_queue| should not be null. In that case, this
   // endpoint will simply send queued messages upon being attached to a
   // |Channel| and immediately detach itself.
-  ChannelEndpoint(RefPtr<ChannelEndpointClient>&& client,
+  ChannelEndpoint(util::RefPtr<ChannelEndpointClient>&& client,
                   unsigned client_port,
                   MessageInTransitQueue* message_queue = nullptr);
 
@@ -192,9 +193,9 @@ class ChannelEndpoint final : public RefCountedThreadSafe<ChannelEndpoint> {
 
   // |client_| must be valid whenever it is non-null. Before |*client_| gives up
   // its reference to this object, it must call |DetachFromClient()|.
-  // NOTE: This is a |RefPtr<>|, rather than a raw pointer, since the |Channel|
-  // needs to keep the client (e.g., |MessagePipe|) alive for the "proxy-proxy"
-  // case.
+  // NOTE: This is a |util:RefPtr<>|, rather than a raw pointer, since the
+  // |Channel| needs to keep the client (e.g., |MessagePipe|) alive for the
+  // "proxy-proxy" case.
   // WARNING: |ChannelEndpointClient| methods must not be called under |mutex_|.
   // Thus to make such a call, a reference must first be taken under |mutex_|
   // and the lock released.
@@ -204,7 +205,7 @@ class ChannelEndpoint final : public RefCountedThreadSafe<ChannelEndpoint> {
   // WARNING: Beware of interactions with |ReplaceClient()|. By the time the
   // call is made, the client may have changed. This must be detected and dealt
   // with.
-  RefPtr<ChannelEndpointClient> client_ MOJO_GUARDED_BY(mutex_);
+  util::RefPtr<ChannelEndpointClient> client_ MOJO_GUARDED_BY(mutex_);
   unsigned client_port_ MOJO_GUARDED_BY(mutex_);
 
   // |channel_| must be valid whenever it is non-null. Before |*channel_| gives