Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Unified Diff: net/socket/client_socket_pool.cc

Issue 10006036: Reverting again ... More crashes, and the instrumentation did not appear to help (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/client_socket_pool.h ('k') | net/socket/client_socket_pool_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool.cc
===================================================================
--- net/socket/client_socket_pool.cc (revision 131144)
+++ net/socket/client_socket_pool.cc (working copy)
@@ -1,10 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "net/socket/client_socket_pool.h"
-#include "base/debug/alias.h"
#include "base/logging.h"
namespace {
@@ -22,26 +21,6 @@
namespace net {
-LayeredPool::LayeredPool() : magic_value_(ALIVE) {}
-
-LayeredPool::~LayeredPool() {
- CrashIfFreed();
- magic_value_ = DEAD;
- stack_trace_ = base::debug::StackTrace();
-}
-
-void LayeredPool::CrashIfFreed() {
- if (magic_value_ != ALIVE) {
- MagicValue magic_value = magic_value_;
- base::debug::StackTrace deletion_callstack = stack_trace_;
-
- base::debug::Alias(&magic_value);
- base::debug::Alias(&deletion_callstack);
-
- CHECK(false);
- }
-}
-
// static
base::TimeDelta ClientSocketPool::unused_idle_socket_timeout() {
return base::TimeDelta::FromSeconds(g_unused_idle_socket_timeout_s);
« no previous file with comments | « net/socket/client_socket_pool.h ('k') | net/socket/client_socket_pool_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698