Make //mojo/edk/system use //mojo/util's WeakPtr(Factory) instead of base's.

mojo/edk/system/raw_channel_posix.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/raw_channel.h"
 
 #include <errno.h>
 #include <sys/uio.h>
 #include <unistd.h>
 
 #include <algorithm>
 #include <deque>
 #include <iterator>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/logging.h"
-#include "base/memory/weak_ptr.h"
 #include "mojo/edk/embedder/platform_channel_utils.h"
 #include "mojo/edk/platform/platform_handle.h"
 #include "mojo/edk/platform/platform_handle_watcher.h"
 #include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/system/transport_data.h"
 #include "mojo/edk/util/make_unique.h"
+#include "mojo/edk/util/weak_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 
 using mojo::platform::PlatformHandle;
 using mojo::platform::PlatformHandleWatcher;
 using mojo::platform::ScopedPlatformHandle;
 using mojo::util::MakeUnique;
 using mojo::util::MutexLocker;
+using mojo::util::WeakPtrFactory;
 
 namespace mojo {
 namespace system {
 
 namespace {
 
 class RawChannelPosix final : public RawChannel {
  public:
   explicit RawChannelPosix(ScopedPlatformHandle handle);
   ~RawChannelPosix() override;
@@ skipping 39 matching lines @@
   std::unique_ptr<PlatformHandleWatcher::WatchToken> write_watch_token_;
 
   bool pending_read_;
 
   std::deque<ScopedPlatformHandle> read_platform_handles_;
 
   bool pending_write_ MOJO_GUARDED_BY(write_mutex());
 
   // This is used for posting tasks from write threads to the I/O thread. The
   // weak pointers it produces are only used/invalidated on the I/O thread.
-  base::WeakPtrFactory<RawChannelPosix> weak_ptr_factory_
+  WeakPtrFactory<RawChannelPosix> weak_ptr_factory_
       MOJO_GUARDED_BY(write_mutex());
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(RawChannelPosix);
 };
 
 RawChannelPosix::RawChannelPosix(ScopedPlatformHandle handle)
     : fd_(handle.Pass()),
       pending_read_(false),
       pending_write_(false),
       weak_ptr_factory_(this) {
@@ skipping 372 matching lines @@
 // -----------------------------------------------------------------------------
 
 // Static factory method declared in raw_channel.h.
 // static
 std::unique_ptr<RawChannel> RawChannel::Create(ScopedPlatformHandle handle) {
   return MakeUnique<RawChannelPosix>(handle.Pass());
 }
 
 }  // namespace system
 }  // namespace mojo