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

content/browser/child_process_security_policy_impl.cc

Index: content/browser/child_process_security_policy_impl.cc
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 2c8a994add46f8ecccb701bc1507e4dd39764dc2..bd84239b04ff44c1301c386013ad8bd70e1a1e01 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -10,7 +10,6 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
@@ -238,9 +237,6 @@ class ChildProcessSecurityPolicyImpl::SecurityState {
     return origin_lock_ == site_gurl;
   }
 
-  // TODO(nick): Remove this once we understand http://crbug.com/600441
-  GURL GetOriginLock() { return origin_lock_; }
-
   void LockToOrigin(const GURL& gurl) {
     origin_lock_ = gurl;
   }
@@ -829,18 +825,6 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(int child_id,
   return state->second->CanAccessDataForOrigin(gurl);
 }
 
-// TODO(nick): Remove this once we understand http://crbug.com/600441
-std::unique_ptr<base::debug::ScopedCrashKey>
-ChildProcessSecurityPolicyImpl::GetOriginLockCrashKey(int child_id) {
-  base::AutoLock lock(lock_);
-  SecurityStateMap::iterator state = security_state_.find(child_id);
-  return base::WrapUnique(new base::debug::ScopedCrashKey(
-      "security_policy_origin_lock",
-      state == security_state_.end()
-          ? "not-found"
-          : state->second->GetOriginLock().possibly_invalid_spec()));
-}
-
 void ChildProcessSecurityPolicyImpl::LockToOrigin(int child_id,
                                                   const GURL& gurl) {
   // "gurl" can be currently empty in some cases, such as file://blah.