Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Unified Diff: mojo/edk/system/raw_channel_posix.cc

Issue 1641393002: Make //mojo/edk/system use //mojo/util's WeakPtr(Factory) instead of base's. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/system/raw_channel.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/raw_channel_posix.cc
diff --git a/mojo/edk/system/raw_channel_posix.cc b/mojo/edk/system/raw_channel_posix.cc
index 3eaed5c25fef13ba85b8d044700aab144a45e2e2..01f16f2beb5f0916bc279be151fda4f4ab1d74df 100644
--- a/mojo/edk/system/raw_channel_posix.cc
+++ b/mojo/edk/system/raw_channel_posix.cc
@@ -16,13 +16,13 @@
#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;
@@ -30,6 +30,7 @@ using mojo::platform::PlatformHandleWatcher;
using mojo::platform::ScopedPlatformHandle;
using mojo::util::MakeUnique;
using mojo::util::MutexLocker;
+using mojo::util::WeakPtrFactory;
namespace mojo {
namespace system {
@@ -89,7 +90,7 @@ class RawChannelPosix final : public RawChannel {
// 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);
« no previous file with comments | « mojo/edk/system/raw_channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698