Add DumpWithoutCrashing to RenderFrameMessageFilter cookie kills

content/browser/child_process_security_policy_impl.cc

 // Copyright (c) 2012 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 "content/browser/child_process_security_policy_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 220 matching lines @@
   bool CanAccessDataForOrigin(const GURL& gurl) {
     if (origin_lock_.is_empty())
       return true;
     // TODO(creis): We must pass the valid browser_context to convert hosted
     // apps URLs.  Currently, hosted apps cannot set cookies in this mode.
     // See http://crbug.com/160576.
     GURL site_gurl = SiteInstanceImpl::GetSiteForURL(NULL, gurl);
     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;
   }
 
   bool has_web_ui_bindings() const {
     return enabled_bindings_ & BINDINGS_POLICY_WEB_UI;
   }
 
   bool can_read_raw_cookies() const {
     return can_read_raw_cookies_;
@@ skipping 565 matching lines @@
 
 bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(int child_id,
                                                             const GURL& gurl) {
   base::AutoLock lock(lock_);
   SecurityStateMap::iterator state = security_state_.find(child_id);
   if (state == security_state_.end())
     return false;
   return state->second->CanAccessDataForOrigin(gurl);
 }
 
+// TODO(nick): Remove this once we understand http://crbug.com/600441
+scoped_ptr<base::debug::ScopedCrashKey>
+ChildProcessSecurityPolicyImpl::GetOriginLockCrashKey(int child_id) {
+  base::AutoLock lock(lock_);
+  SecurityStateMap::iterator state = security_state_.find(child_id);
+  return make_scoped_ptr(new base::debug::ScopedCrashKey(
+      "policy_origin_lock", state == security_state_.end()

[Avi (use Gerrit), 2016/04/05 01:41:23]

The key constant in the crash keys file is "security_origin_lock", not
"policy_origin_lock".

[ncarter (slow), 2016/05/03 00:16:01]

Done. Good catch, thanks!

+                                ? "not-found"
+                                : state->second->GetOriginLock().spec()));
+}
+
 void ChildProcessSecurityPolicyImpl::LockToOrigin(int child_id,
                                                   const GURL& gurl) {
   // "gurl" can be currently empty in some cases, such as file://blah.
   DCHECK(SiteInstanceImpl::GetSiteForURL(NULL, gurl) == gurl);
   base::AutoLock lock(lock_);
   SecurityStateMap::iterator state = security_state_.find(child_id);
   DCHECK(state != security_state_.end());
   state->second->LockToOrigin(gurl);
 }
 
@@ skipping 32 matching lines @@
   base::AutoLock lock(lock_);
 
   SecurityStateMap::iterator state = security_state_.find(child_id);
   if (state == security_state_.end())
     return false;
 
   return state->second->can_send_midi_sysex();
 }
 
 }  // namespace content