[Merge to 55.0.2846.2] Revert of Fix memory leak in ThreadWatcher. (patchset #3 id:40001 of https:/…

chrome/browser/metrics/thread_watcher_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/metrics/thread_watcher.h"
 
 #include <math.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 261 matching lines @@
     WaitForSetUp(TimeDelta::FromMinutes(1));
   }
 
   void SetUpObjects() {
     DCHECK(WatchDogThread::CurrentlyOnWatchDogThread());
 
     // Setup the registry for thread watchers.
     thread_watcher_list_ = new ThreadWatcherList();
 
     // Create thread watcher object for the IO thread.
-    std::unique_ptr<CustomThreadWatcher> io_watcher(
-        new CustomThreadWatcher(BrowserThread::IO, kIOThreadName,
-                                kSleepTime, kUnresponsiveTime));
-    io_watcher_ = io_watcher.get();
-    ASSERT_TRUE(ThreadWatcherList::Register(std::move(io_watcher)));
+    io_watcher_ = new CustomThreadWatcher(BrowserThread::IO, kIOThreadName,
+                                          kSleepTime, kUnresponsiveTime);
     EXPECT_EQ(io_watcher_, thread_watcher_list_->Find(BrowserThread::IO));
 
     // Create thread watcher object for the DB thread.
-    std::unique_ptr<CustomThreadWatcher> db_watcher(
-        new CustomThreadWatcher(BrowserThread::DB, kDBThreadName,
-                                kSleepTime, kUnresponsiveTime));
-    db_watcher_ = db_watcher.get();
-    ASSERT_TRUE(ThreadWatcherList::Register(std::move(db_watcher)));
+    db_watcher_ = new CustomThreadWatcher(BrowserThread::DB, kDBThreadName,
+                                          kSleepTime, kUnresponsiveTime);
     EXPECT_EQ(db_watcher_, thread_watcher_list_->Find(BrowserThread::DB));
 
     {
       base::AutoLock lock(lock_);
       initialized_ = true;
     }
     setup_complete_.Signal();
   }
 
   void WaitForSetUp(TimeDelta wait_time) {
@@ skipping 515 matching lines @@
 }
 
 TEST_F(JankTimeBombTest, ArmTest) {
   // Test firing of Alarm by passing empty delay.
   TestingJankTimeBomb timebomb((base::TimeDelta()));
   if (!timebomb.IsEnabled())
     return;
   WaitForWatchDogThreadPostTask();
   EXPECT_TRUE(timebomb.alarm_invoked());
 }