Revert "Add DumpWithoutCrashing and crash keys to get more context"

chrome/common/crash_keys.cc

 // Copyright (c) 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 "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
@@ skipping 168 matching lines @@
 
     // Temporary for https://crbug.com/591478.
     { "initrf_parent_proxy_exists", kSmallSize },
     { "initrf_render_view_is_live", kSmallSize },
     { "initrf_parent_is_in_same_site_instance", kSmallSize},
     { "initrf_parent_process_is_live", kSmallSize},
     { "initrf_root_is_in_same_site_instance", kSmallSize},
     { "initrf_root_is_in_same_site_instance_as_parent", kSmallSize},
     { "initrf_root_process_is_live", kSmallSize},
     { "initrf_root_proxy_is_live", kSmallSize},
-
-    // Temporary for https://crbug.com/600441
-    { "cookie_url", kSmallSize },
-    { "cookie_first_party", kSmallSize },
-    { "security_policy_origin_lock", kSmallSize },
   };
 
   // This dynamic set of keys is used for sets of key value pairs when gathering
   // a collection of data, like command line switches or extension IDs.
   std::vector<base::debug::CrashKey> keys(
       fixed_keys, fixed_keys + arraysize(fixed_keys));
 
   crash_keys::GetCrashKeysForCommandLineSwitches(&keys);
 
   // Register the extension IDs.
@@ skipping 124 matching lines @@
 }
 
 ScopedPrinterInfo::~ScopedPrinterInfo() {
   for (size_t i = 0; i < kPrinterInfoCount; ++i) {
     std::string key = base::StringPrintf(kPrinterInfo, i + 1);
     base::debug::ClearCrashKey(key);
   }
 }
 
 }  // namespace crash_keys