Revert "Use in-class initializers for base::WeakPtrFactory in base/."

This reverts commit 66ec904. Reason for revert: content_browsertests failing on chromium.memory/Mac (guessed) Original change's description: > Use in-class initializers for base::WeakPtrFactory in base/. > > Generated by: https://chromium-review.googlesource.com/c/chromium/src/+/1689216 > > Bug: 981415 > Change-Id: Ib185d9d46bbfa787b77fbbafcc3e5bfb7799dd20 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1688886 > Reviewed-by: Daniel Cheng <dcheng@chromium.org> > Commit-Queue: Jeremy Roman <jbroman@chromium.org> > Cr-Commit-Position: refs/heads/master@{#674950} TBR=dcheng@chromium.org,gab@chromium.org,jbroman@chromium.org Change-Id: Icba04326fde8bca8b2c30b6da051c2e37b681f6d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 981415, 981444 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1686590 Reviewed-by: Yoichi Osato <yoichio@chromium.org> Commit-Queue: Yoichi Osato <yoichio@chromium.org> Cr-Commit-Position: refs/heads/master@{#674965}
Denger-Network · Jul 5, 2019 · 7407a6c · 7407a6c
1 parent 2b5405d
commit 7407a6c
Show file tree

Hide file tree

Showing 25 changed files with 46 additions and 37 deletions.
diff --git a/base/cancelable_callback.h b/base/cancelable_callback.h
@@ -61,11 +61,11 @@ namespace internal {
 template <typename CallbackType>
 class CancelableCallbackImpl {
  public:
-  CancelableCallbackImpl() {}
+  CancelableCallbackImpl() : weak_ptr_factory_(this) {}
 
   // |callback| must not be null.
   explicit CancelableCallbackImpl(CallbackType callback)
-      : callback_(std::move(callback)) {
+      : callback_(std::move(callback)), weak_ptr_factory_(this) {
     DCHECK(callback_);
   }
 
@@ -128,7 +128,7 @@ class CancelableCallbackImpl {
 
   // The stored closure that may be cancelled.
   CallbackType callback_;
-  mutable base::WeakPtrFactory<CancelableCallbackImpl> weak_ptr_factory_{this};
+  mutable base::WeakPtrFactory<CancelableCallbackImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CancelableCallbackImpl);
 };

diff --git a/base/files/file_descriptor_watcher_posix.cc b/base/files/file_descriptor_watcher_posix.cc
@@ -156,7 +156,8 @@ FileDescriptorWatcher::Controller::Controller(MessagePumpForIO::Mode mode,
                                               const RepeatingClosure& callback)
     : callback_(callback),
       io_thread_task_runner_(
-          tls_fd_watcher.Get().Get()->io_thread_task_runner()) {
+          tls_fd_watcher.Get().Get()->io_thread_task_runner()),
+      weak_factory_(this) {
   DCHECK(!callback_.is_null());
   DCHECK(io_thread_task_runner_);
   watcher_ = std::make_unique<Watcher>(weak_factory_.GetWeakPtr(), mode, fd);

diff --git a/base/files/file_descriptor_watcher_posix.h b/base/files/file_descriptor_watcher_posix.h
@@ -79,7 +79,7 @@ class BASE_EXPORT FileDescriptorWatcher {
     // instantiated.
     SequenceChecker sequence_checker_;
 
-    WeakPtrFactory<Controller> weak_factory_{this};
+    WeakPtrFactory<Controller> weak_factory_;
 
     DISALLOW_COPY_AND_ASSIGN(Controller);
   };

diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc
@@ -252,7 +252,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
   // appear after it, that is not possible.
   WeakPtr<FilePathWatcherImpl> weak_ptr_;
 
-  WeakPtrFactory<FilePathWatcherImpl> weak_factory_{this};
+  WeakPtrFactory<FilePathWatcherImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FilePathWatcherImpl);
 };
@@ -391,7 +391,7 @@ void InotifyReader::OnInotifyEvent(const inotify_event* event) {
   }
 }
 
-FilePathWatcherImpl::FilePathWatcherImpl() {
+FilePathWatcherImpl::FilePathWatcherImpl() : weak_factory_(this) {
   weak_ptr_ = weak_factory_.GetWeakPtr();
 }
 

diff --git a/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc
@@ -31,7 +31,8 @@ class FileProxyTest : public testing::Test {
             test::ScopedTaskEnvironment::MainThreadType::IO),
         file_thread_("FileProxyTestFileThread"),
         error_(File::FILE_OK),
-        bytes_written_(-1) {}
+        bytes_written_(-1),
+        weak_factory_(this) {}
 
   void SetUp() override {
     ASSERT_TRUE(dir_.CreateUniqueTempDir());
@@ -102,7 +103,7 @@ class FileProxyTest : public testing::Test {
   File::Info file_info_;
   std::vector<char> buffer_;
   int bytes_written_;
-  WeakPtrFactory<FileProxyTest> weak_factory_{this};
+  WeakPtrFactory<FileProxyTest> weak_factory_;
 };
 
 TEST_F(FileProxyTest, CreateOrOpen_Create) {

diff --git a/base/files/important_file_writer.cc b/base/files/important_file_writer.cc
@@ -230,7 +230,8 @@ ImportantFileWriter::ImportantFileWriter(
       task_runner_(std::move(task_runner)),
       serializer_(nullptr),
       commit_interval_(interval),
-      histogram_suffix_(histogram_suffix ? histogram_suffix : "") {
+      histogram_suffix_(histogram_suffix ? histogram_suffix : ""),
+      weak_factory_(this) {
   DCHECK(task_runner_);
 }
 

diff --git a/base/files/important_file_writer.h b/base/files/important_file_writer.h
@@ -151,7 +151,7 @@ class BASE_EXPORT ImportantFileWriter {
 
   SEQUENCE_CHECKER(sequence_checker_);
 
-  WeakPtrFactory<ImportantFileWriter> weak_factory_{this};
+  WeakPtrFactory<ImportantFileWriter> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImportantFileWriter);
 };

diff --git a/base/memory/weak_ptr_unittest.cc b/base/memory/weak_ptr_unittest.cc
@@ -79,8 +79,8 @@ struct Arrow {
   WeakPtr<Target> target;
 };
 struct TargetWithFactory : public Target {
-  TargetWithFactory() {}
-  WeakPtrFactory<Target> factory{this};
+  TargetWithFactory() : factory(this) {}
+  WeakPtrFactory<Target> factory;
 };
 
 // Helper class to create and destroy weak pointer copies

diff --git a/base/metrics/statistics_recorder_unittest.cc b/base/metrics/statistics_recorder_unittest.cc
@@ -645,7 +645,7 @@ class TestHistogramProvider : public StatisticsRecorder::HistogramProvider {
  public:
   explicit TestHistogramProvider(
       std::unique_ptr<PersistentHistogramAllocator> allocator)
-      : allocator_(std::move(allocator)) {
+      : allocator_(std::move(allocator)), weak_factory_(this) {
     StatisticsRecorder::RegisterHistogramProvider(weak_factory_.GetWeakPtr());
   }
 
@@ -661,7 +661,7 @@ class TestHistogramProvider : public StatisticsRecorder::HistogramProvider {
 
  private:
   std::unique_ptr<PersistentHistogramAllocator> allocator_;
-  WeakPtrFactory<TestHistogramProvider> weak_factory_{this};
+  WeakPtrFactory<TestHistogramProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestHistogramProvider);
 };

diff --git a/base/observer_list_threadsafe_unittest.cc b/base/observer_list_threadsafe_unittest.cc
@@ -80,7 +80,8 @@ class AddRemoveThread : public Foo {
             SingleThreadTaskRunnerThreadMode::DEDICATED)),
         in_list_(false),
         start_(Time::Now()),
-        do_notifies_(notify) {
+        do_notifies_(notify),
+        weak_factory_(this) {
     task_runner_->PostTask(
         FROM_HERE,
         base::BindOnce(&AddRemoveThread::AddTask, weak_factory_.GetWeakPtr()));
@@ -131,7 +132,7 @@ class AddRemoveThread : public Foo {
 
   bool do_notifies_;    // Whether these threads should do notifications.
 
-  base::WeakPtrFactory<AddRemoveThread> weak_factory_{this};
+  base::WeakPtrFactory<AddRemoveThread> weak_factory_;
 };
 
 }  // namespace

diff --git a/base/observer_list_types.cc b/base/observer_list_types.cc
@@ -6,7 +6,7 @@
 
 namespace base {
 
-CheckedObserver::CheckedObserver() {}
+CheckedObserver::CheckedObserver() : factory_(this) {}
 CheckedObserver::~CheckedObserver() = default;
 
 bool CheckedObserver::IsInObserverList() const {

diff --git a/base/observer_list_types.h b/base/observer_list_types.h
@@ -39,7 +39,7 @@ class BASE_EXPORT CheckedObserver {
   friend class internal::CheckedObserverAdapter;
 
   // Must be mutable to allow ObserverList<const Foo>.
-  mutable WeakPtrFactory<CheckedObserver> factory_{this};
+  mutable WeakPtrFactory<CheckedObserver> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckedObserver);
 };

diff --git a/base/run_loop.cc b/base/run_loop.cc
@@ -117,7 +117,8 @@ void RunLoop::RegisterDelegateForCurrentThread(Delegate* delegate) {
 RunLoop::RunLoop(Type type)
     : delegate_(GetTlsDelegate().Get()),
       type_(type),
-      origin_task_runner_(ThreadTaskRunnerHandle::Get()) {
+      origin_task_runner_(ThreadTaskRunnerHandle::Get()),
+      weak_factory_(this) {
   DCHECK(delegate_) << "A RunLoop::Delegate must be bound to this thread prior "
                        "to using RunLoop.";
   DCHECK(origin_task_runner_);

diff --git a/base/run_loop.h b/base/run_loop.h
@@ -386,7 +386,7 @@ class BASE_EXPORT RunLoop {
   const scoped_refptr<SingleThreadTaskRunner> origin_task_runner_;
 
   // WeakPtrFactory for QuitClosure safety.
-  WeakPtrFactory<RunLoop> weak_factory_{this};
+  WeakPtrFactory<RunLoop> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RunLoop);
 };

diff --git a/base/task/promise/promise_unittest.cc b/base/task/promise/promise_unittest.cc
@@ -59,15 +59,15 @@ class MockObject {
 struct DummyError {};
 
 struct Cancelable {
-  Cancelable() {}
+  Cancelable() : weak_ptr_factory(this) {}
 
   void LogTask(std::vector<std::string>* log, std::string value) {
     log->push_back(value);
   }
 
   void NopTask() {}
 
-  WeakPtrFactory<Cancelable> weak_ptr_factory{this};
+  WeakPtrFactory<Cancelable> weak_ptr_factory;
 };
 
 }  // namespace

diff --git a/base/task/sequence_manager/sequence_manager_impl.cc b/base/task/sequence_manager/sequence_manager_impl.cc
@@ -191,7 +191,8 @@ SequenceManagerImpl::SequenceManagerImpl(
 
       empty_queues_to_reload_(associated_thread_),
       memory_corruption_sentinel_(kMemoryCorruptionSentinelValue),
-      main_thread_only_(associated_thread_, settings_) {
+      main_thread_only_(associated_thread_, settings_),
+      weak_factory_(this) {
   TRACE_EVENT_OBJECT_CREATED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("sequence_manager"), "SequenceManager", this);
   main_thread_only().selector.SetTaskQueueSelectorObserver(this);

diff --git a/base/task/sequence_manager/sequence_manager_impl.h b/base/task/sequence_manager/sequence_manager_impl.h
@@ -422,7 +422,7 @@ class BASE_EXPORT SequenceManagerImpl
     return main_thread_only_;
   }
 
-  WeakPtrFactory<SequenceManagerImpl> weak_factory_{this};
+  WeakPtrFactory<SequenceManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SequenceManagerImpl);
 };

diff --git a/base/task/sequence_manager/sequence_manager_impl_unittest.cc b/base/task/sequence_manager/sequence_manager_impl_unittest.cc
@@ -2520,14 +2520,15 @@ TEST_P(SequenceManagerTest, TaskQueueObserver_DelayedWorkWhichCanRunNow) {
 
 class CancelableTask {
  public:
-  explicit CancelableTask(const TickClock* clock) : clock_(clock) {}
+  explicit CancelableTask(const TickClock* clock)
+      : clock_(clock), weak_factory_(this) {}
 
   void RecordTimeTask(std::vector<TimeTicks>* run_times) {
     run_times->push_back(clock_->NowTicks());
   }
 
   const TickClock* clock_;
-  WeakPtrFactory<CancelableTask> weak_factory_{this};
+  WeakPtrFactory<CancelableTask> weak_factory_;
 };
 
 TEST_P(SequenceManagerTest, TaskQueueObserver_SweepCanceledDelayedTasks) {
@@ -4509,14 +4510,14 @@ TEST_P(SequenceManagerTest, TaskPriortyInterleaving) {
 
 class CancelableTaskWithDestructionObserver {
  public:
-  CancelableTaskWithDestructionObserver() {}
+  CancelableTaskWithDestructionObserver() : weak_factory_(this) {}
 
   void Task(std::unique_ptr<ScopedClosureRunner> destruction_observer) {
     destruction_observer_ = std::move(destruction_observer);
   }
 
   std::unique_ptr<ScopedClosureRunner> destruction_observer_;
-  WeakPtrFactory<CancelableTaskWithDestructionObserver> weak_factory_{this};
+  WeakPtrFactory<CancelableTaskWithDestructionObserver> weak_factory_;
 };
 
 TEST_P(SequenceManagerTest, PeriodicHousekeeping) {

diff --git a/base/task/sequence_manager/test/test_task_queue.cc b/base/task/sequence_manager/test/test_task_queue.cc
@@ -11,7 +11,7 @@ namespace sequence_manager {
 
 TestTaskQueue::TestTaskQueue(std::unique_ptr<internal::TaskQueueImpl> impl,
                              const TaskQueue::Spec& spec)
-    : TaskQueue(std::move(impl), spec) {}
+    : TaskQueue(std::move(impl), spec), weak_factory_(this) {}
 
 TestTaskQueue::~TestTaskQueue() = default;
 

diff --git a/base/task/sequence_manager/test/test_task_queue.h b/base/task/sequence_manager/test/test_task_queue.h
@@ -24,7 +24,7 @@ class TestTaskQueue : public TaskQueue {
   ~TestTaskQueue() override;  // Ref-counted.
 
   // Used to ensure that task queue is deleted in tests.
-  WeakPtrFactory<TestTaskQueue> weak_factory_{this};
+  WeakPtrFactory<TestTaskQueue> weak_factory_;
 };
 
 }  // namespace sequence_manager

diff --git a/base/task/sequence_manager/thread_controller_impl.cc b/base/task/sequence_manager/thread_controller_impl.cc
@@ -32,7 +32,8 @@ ThreadControllerImpl::ThreadControllerImpl(
                                     ? funneled_sequence_manager->GetTaskRunner()
                                     : nullptr),
       time_source_(time_source),
-      work_deduplicator_(associated_thread_) {
+      work_deduplicator_(associated_thread_),
+      weak_factory_(this) {
   if (task_runner_ || funneled_sequence_manager_)
     work_deduplicator_.BindToCurrentThread();
   immediate_do_work_closure_ =

diff --git a/base/task/sequence_manager/thread_controller_impl.h b/base/task/sequence_manager/thread_controller_impl.h
@@ -127,7 +127,7 @@ class BASE_EXPORT ThreadControllerImpl : public ThreadController,
   bool default_task_runner_set_ = false;
 #endif
 
-  WeakPtrFactory<ThreadControllerImpl> weak_factory_{this};
+  WeakPtrFactory<ThreadControllerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ThreadControllerImpl);
 };

diff --git a/base/task/sequence_manager/work_queue_unittest.cc b/base/task/sequence_manager/work_queue_unittest.cc
@@ -31,11 +31,11 @@ class MockObserver : public WorkQueueSets::Observer {
 void NopTask() {}
 
 struct Cancelable {
-  Cancelable() {}
+  Cancelable() : weak_ptr_factory(this) {}
 
   void NopTask() {}
 
-  WeakPtrFactory<Cancelable> weak_ptr_factory{this};
+  WeakPtrFactory<Cancelable> weak_ptr_factory;
 };
 
 class RealTimeDomainFake : public RealTimeDomain {

diff --git a/base/trace_event/blame_context.cc b/base/trace_event/blame_context.cc
@@ -24,7 +24,8 @@ BlameContext::BlameContext(const char* category,
       id_(id),
       parent_scope_(parent_context ? parent_context->scope() : nullptr),
       parent_id_(parent_context ? parent_context->id() : 0),
-      category_group_enabled_(nullptr) {
+      category_group_enabled_(nullptr),
+      weak_factory_(this) {
   DCHECK(!parent_context || !std::strcmp(name_, parent_context->name()))
       << "Parent blame context must have the same name";
 }

diff --git a/base/trace_event/blame_context.h b/base/trace_event/blame_context.h
@@ -127,7 +127,7 @@ class BASE_EXPORT BlameContext
   const unsigned char* category_group_enabled_;
 
   ThreadChecker thread_checker_;
-  WeakPtrFactory<BlameContext> weak_factory_{this};
+  WeakPtrFactory<BlameContext> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BlameContext);
 };