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

content/browser/frame_host/render_frame_message_filter.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 "content/browser/frame_host/render_frame_message_filter.h"
 
 #include "base/command_line.h"
-#include "base/debug/crash_logging.h"
-#include "base/debug/dump_without_crashing.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/renderer_host/render_widget_helper.h"
 #include "content/common/frame_messages.h"
@@ skipping 224 matching lines @@
                  params.frame_owner_properties, *new_routing_id));
 }
 
 void RenderFrameMessageFilter::OnSetCookie(int render_frame_id,
                                            const GURL& url,
                                            const GURL& first_party_for_cookies,
                                            const std::string& cookie) {
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
   if (!policy->CanAccessDataForOrigin(render_process_id_, url)) {
-    {
-      // TODO(nick): Remove this once we understand http://crbug.com/600441
-      auto origin_lock = policy->GetOriginLockCrashKey(render_process_id_);
-      base::debug::ScopedCrashKey("cookie_url", url.possibly_invalid_spec());
-      base::debug::ScopedCrashKey(
-          "cookie_first_party",
-          first_party_for_cookies.possibly_invalid_spec());
-      base::debug::DumpWithoutCrashing();
-    }
-
     bad_message::ReceivedBadMessage(this,
                                     bad_message::RFMF_SET_COOKIE_BAD_ORIGIN);
     return;
   }
 
   net::CookieOptions options;
   bool experimental_web_platform_features_enabled =
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableExperimentalWebPlatformFeatures);
   const std::string enforce_strict_secure_group =
@@ skipping 13 matching lines @@
   }
 }
 
 void RenderFrameMessageFilter::OnGetCookies(int render_frame_id,
                                             const GURL& url,
                                             const GURL& first_party_for_cookies,
                                             IPC::Message* reply_msg) {
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
   if (!policy->CanAccessDataForOrigin(render_process_id_, url)) {
-    {
-      // TODO(nick): Remove this once we understand http://crbug.com/600441
-      auto origin_lock = policy->GetOriginLockCrashKey(render_process_id_);
-      base::debug::ScopedCrashKey("cookie_url", url.possibly_invalid_spec());
-      base::debug::ScopedCrashKey(
-          "cookie_first_party",
-          first_party_for_cookies.possibly_invalid_spec());
-      base::debug::DumpWithoutCrashing();
-    }
-
     bad_message::ReceivedBadMessage(this,
                                     bad_message::RFMF_GET_COOKIES_BAD_ORIGIN);
     delete reply_msg;
     return;
   }
 
   // If we crash here, figure out what URL the renderer was requesting.
   // http://crbug.com/99242
   char url_buf[128];
   base::strlcpy(url_buf, url.spec().c_str(), arraysize(url_buf));
@@ skipping 224 matching lines @@
   net::URLRequestContext* context =
       GetContentClient()->browser()->OverrideRequestContextForURL(
           url, resource_context_);
   if (!context)
     context = request_context_->GetURLRequestContext();
 
   return context;
 }
 
 }  // namespace content