Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/trace_event/memory_dump_manager_unittest.cc

 // Copyright 2015 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 "base/trace_event/memory_dump_manager.h"
 
 #include "base/trace_event/memory_dump_provider.h"
 #include "base/trace_event/process_memory_dump.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 
 namespace base {
 namespace trace_event {
 
 class MemoryDumpManagerTest : public testing::Test {
  public:
   void SetUp() override {
-    mdm_.reset(new MemoryDumpManager());
-    MemoryDumpManager::SetInstanceForTesting(mdm_.get());
-    ASSERT_EQ(mdm_, MemoryDumpManager::GetInstance());
     MemoryDumpManager::GetInstance()->Initialize();
+    mdm_ = MemoryDumpManager::GetInstance();
   }
 
   void TearDown() override {
-    MemoryDumpManager::SetInstanceForTesting(nullptr);
-    mdm_.reset();
+    MemoryDumpManager::DeleteForTesting();
     TraceLog::DeleteForTesting();
+    mdm_ = NULL;
   }
 
  protected:
   const char* const kTraceCategory = MemoryDumpManager::kTraceCategory;
 
   void EnableTracing(const char* category) {
     TraceLog::GetInstance()->SetEnabled(
         CategoryFilter(category), TraceLog::RECORDING_MODE, TraceOptions());
   }
 
   void DisableTracing() { TraceLog::GetInstance()->SetDisabled(); }
 
-  scoped_ptr<MemoryDumpManager> mdm_;
+  MemoryDumpManager* mdm_;
 
  private:
   // We want our singleton torn down after each test.
   ShadowingAtExitManager at_exit_manager_;
 };
 
 class MockDumpProvider : public MemoryDumpProvider {
  public:
   MOCK_METHOD1(DumpInto, void(ProcessMemoryDump* pmd));
 };
@@ skipping 65 matching lines @@
   mdm_->RegisterDumpProvider(&mdp1);
   EnableTracing(kTraceCategory);
   EXPECT_CALL(mdp1, DumpInto(_)).Times(1);
   EXPECT_CALL(mdp2, DumpInto(_)).Times(1);
   mdm_->RequestDumpPoint(DumpPointType::EXPLICITLY_TRIGGERED);
   DisableTracing();
 }
 
 }  // namespace trace_Event
 }  // namespace base