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

chrome/common/crash_keys_unittest.cc

 // Copyright 2013 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/common/crash_keys.h"
 
 #include <map>
 #include <set>
 #include <string>
 
+#include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/crash_logging.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class CrashKeysTest : public testing::Test {
  public:
   void SetUp() override {
     self_ = this;
     base::debug::SetCrashKeyReportingFunctions(
         &SetCrashKeyValue, &ClearCrashKey);
     crash_keys::RegisterChromeCrashKeys();
   }
 
   void TearDown() override {
-    base::debug::ResetCrashLoggingForTesting();
     self_ = NULL;
   }
 
   bool HasCrashKey(const std::string& key) {
     return keys_.find(key) != keys_.end();
   }
 
   std::string GetKeyValue(const std::string& key) {
     std::map<std::string, std::string>::const_iterator it = keys_.find(key);
     if (it == keys_.end())
       return std::string();
     return it->second;
   }
 
  private:
   static void SetCrashKeyValue(const base::StringPiece& key,
                                const base::StringPiece& value) {
     self_->keys_[key.as_string()] = value.as_string();
   }
 
   static void ClearCrashKey(const base::StringPiece& key) {
     self_->keys_.erase(key.as_string());
   }
 
   static CrashKeysTest* self_;
 
   std::map<std::string, std::string> keys_;
+  base::ShadowingAtExitManager at_exit_manager_;

[danakj, 2015/09/24 21:08:36]

ditto

[Robert Sesek, 2015/09/24 21:28:19]

Done.

 };
 
 CrashKeysTest* CrashKeysTest::self_ = NULL;
 
 TEST_F(CrashKeysTest, Switches) {
   // Set three switches.
   {
     base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
     for (int i = 1; i <= 3; ++i)
       command_line.AppendSwitch(base::StringPrintf("--flag-%d", i));
@@ skipping 111 matching lines @@
 
   crash_keys::SetSwitchesFromCommandLine(&command_line);
 
   EXPECT_EQ("--vv=1", GetKeyValue("switch-1"));
   EXPECT_EQ("--vvv", GetKeyValue("switch-2"));
   EXPECT_EQ("--enable-multi-profiles", GetKeyValue("switch-3"));
   EXPECT_EQ("--device-management-url=https://foo/bar", GetKeyValue("switch-4"));
   EXPECT_FALSE(HasCrashKey("switch-5"));
 }
 #endif