Revert of Use a class instead of several separate globals in crash_logging.cc.

base/debug/crash_logging_unittest.cc

Index: base/debug/crash_logging_unittest.cc
diff --git a/base/debug/crash_logging_unittest.cc b/base/debug/crash_logging_unittest.cc
index aec0fbd87d6ec3002be74643d1696fafdb213449..4cd9f3e3b09f5a476bdd0d0f412371b54e31ce0e 100644
--- a/base/debug/crash_logging_unittest.cc
+++ b/base/debug/crash_logging_unittest.cc
@@ -7,13 +7,12 @@
 #include <map>
 #include <string>
 
-#include "base/at_exit.h"
 #include "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
-std::map<std::string, std::string>* key_values_ = nullptr;
+std::map<std::string, std::string>* key_values_ = NULL;
 
 }  // namespace
 
@@ -27,8 +26,10 @@
   }
 
   void TearDown() override {
+    base::debug::ResetCrashLoggingForTesting();
+
     delete key_values_;
-    key_values_ = nullptr;
+    key_values_ = NULL;
   }
 
  private:
@@ -40,10 +41,6 @@
   static void ClearKeyValue(const base::StringPiece& key) {
     key_values_->erase(key.as_string());
   }
-
-  // The ShadowingAtExitManager will destroy the singleton used to store crash
-  // key data upon destruction.
-  base::ShadowingAtExitManager at_exit_manager_;
 };
 
 TEST_F(CrashLoggingTest, SetClearSingle) {