Revert of memory-infra: Finish moving memory_infra from TracingController

services/resource_coordinator/memory/coordinator/coordinator_impl_unittest.cc

Index: services/resource_coordinator/memory/coordinator/coordinator_impl_unittest.cc
diff --git a/services/resource_coordinator/memory/coordinator/coordinator_impl_unittest.cc b/services/resource_coordinator/memory/coordinator/coordinator_impl_unittest.cc
index 4d63e98b63758b4efc93941fa8dbde7a574244cb..1bc8254b90282a01e301422f3c558b2c944cde85 100644
--- a/services/resource_coordinator/memory/coordinator/coordinator_impl_unittest.cc
+++ b/services/resource_coordinator/memory/coordinator/coordinator_impl_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h"
-#include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
@@ -21,20 +20,15 @@
  public:
   CoordinatorImplTest() {}
   void SetUp() override {
-    dump_response_args_ = {0U, false};
-    coordinator_.reset(new CoordinatorImpl());
-    coordinator_->InitializeForTest(base::ThreadTaskRunnerHandle::Get());
+    dump_response_args_ = {static_cast<uint64_t>(-1), false};
   }
-
-  void TearDown() override { coordinator_.reset(); }
 
   void RegisterProcessLocalDumpManager(
       mojom::ProcessLocalDumpManagerPtr process_manager) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE,
-        base::Bind(&CoordinatorImpl::RegisterProcessLocalDumpManager,
-                   base::Unretained(coordinator_.get()),
-                   base::Passed(&process_manager)));
+        FROM_HERE, base::Bind(&CoordinatorImpl::RegisterProcessLocalDumpManager,
+                              base::Unretained(&coordinator_),
+                              base::Passed(&process_manager)));
   }
 
   void RequestGlobalMemoryDump(base::trace_event::MemoryDumpRequestArgs args,
@@ -42,7 +36,7 @@
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&CoordinatorImpl::RequestGlobalMemoryDump,
-                   base::Unretained(coordinator_.get()), args,
+                   base::Unretained(&coordinator_), args,
                    base::Bind(&CoordinatorImplTest::OnGlobalMemoryDumpResponse,
                               base::Unretained(this), closure)));
   }
@@ -63,11 +57,11 @@
   DumpResponseArgs dump_response_args_;
 
  private:
-  std::unique_ptr<CoordinatorImpl> coordinator_;
+  CoordinatorImpl coordinator_;
   base::MessageLoop message_loop_;
 };
 
-class MockDumpManager : public mojom::ProcessLocalDumpManager {
+class MockDumpManager : mojom::ProcessLocalDumpManager {
  public:
   MockDumpManager(CoordinatorImplTest* test_coordinator, int expected_calls)
       : binding_(this), expected_calls_(expected_calls) {
@@ -99,7 +93,7 @@
       base::trace_event::MemoryDumpLevelOfDetail::DETAILED};
   RequestGlobalMemoryDump(args, run_loop.QuitClosure());
   run_loop.Run();
-  EXPECT_EQ(1234U, dump_response_args_.dump_guid);
+  EXPECT_EQ(static_cast<uint64_t>(1234), dump_response_args_.dump_guid);
   EXPECT_TRUE(dump_response_args_.success);
 }
 
@@ -115,7 +109,7 @@
 
   run_loop.Run();
 
-  EXPECT_EQ(2345U, dump_response_args_.dump_guid);
+  EXPECT_EQ(static_cast<uint64_t>(2345), dump_response_args_.dump_guid);
   EXPECT_TRUE(dump_response_args_.success);
 }
 
@@ -138,7 +132,7 @@
 
   run_loop.Run();
 
-  EXPECT_EQ(3456U, dump_response_args_.dump_guid);
+  EXPECT_EQ(static_cast<uint64_t>(3456), dump_response_args_.dump_guid);
   EXPECT_FALSE(dump_response_args_.success);
 }
 }  // namespace memory_instrumentation