Revert 143251 - Log stack trace when ObjectWatcher::StartWatching() is called.

Something isn't being cleaned up properly and we're seeing crashes where we call
into a destroyed class.

BUG=121086
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10535041

TBR=dcheng@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10633015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143468 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 11 deletions

diff --git a/base/win/object_watcher.cc b/base/win/object_watcher.cc
index 0b9d7a0..ebe596f 100644
--- a/base/win/object_watcher.cc
+++ b/base/win/object_watcher.cc
@@ -5,7 +5,6 @@
 #include "base/win/object_watcher.h"
 
 #include "base/bind.h"
-#include "base/debug/alias.h"
 #include "base/logging.h"
 
 namespace base {
@@ -41,7 +40,6 @@ bool ObjectWatcher::StartWatching(HANDLE object, Delegate* delegate) {
                          delegate);
   object_ = object;
   origin_loop_ = MessageLoop::current();
-  stack_trace_ = base::debug::StackTrace();
 
   if (!RegisterWaitForSingleObject(&wait_object_, object, DoneWaiting,
                                    this, INFINITE, wait_flags)) {
@@ -99,10 +97,6 @@ void ObjectWatcher::Signal(Delegate* delegate) {
   // StartWatching(). As a result, we save any state we need and clear previous
   // watcher state before signaling the delegate.
   HANDLE object = object_;
-  // Alias the stack trace where the watch was started so it'll be available in
-  // minidumps.
-  base::debug::StackTrace stack_trace = stack_trace_;
-  base::debug::Alias(&stack_trace);
   StopWatching();
   delegate->OnObjectSignaled(object);
 }
diff --git a/base/win/object_watcher.h b/base/win/object_watcher.h
index 789a211..2a515a1 100644
--- a/base/win/object_watcher.h
+++ b/base/win/object_watcher.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -10,7 +10,6 @@
 
 #include "base/base_export.h"
 #include "base/callback.h"
-#include "base/debug/stack_trace.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 
@@ -94,9 +93,6 @@ class BASE_EXPORT ObjectWatcher : public MessageLoop::DestructionObserver {
   HANDLE wait_object_;        // Returned by RegisterWaitForSingleObject
   MessageLoop* origin_loop_;  // Used to get back to the origin thread
 
-  // For debugging crbug.com/121086.
-  base::debug::StackTrace stack_trace_;
-
   DISALLOW_COPY_AND_ASSIGN(ObjectWatcher);
 };