Revert "chromeos: Add a bool flag to catch crash cause of http://crbug.com/134507."

This CL reverts r144508 because the crash no longer happens.

BUG=134507
TEST=none.

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

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

2 files changed, 1 insertions, 14 deletions

diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index de7f492..e4a3f38 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ -64,13 +63,10 @@ Window::Window(WindowDelegate* delegate)
       id_(-1),
       transparent_(false),
       user_data_(NULL),
-      ignore_events_(false),
-      in_set_visible_call_(false) {
+      ignore_events_(false) {
 }
 
 Window::~Window() {
-  CHECK(!in_set_visible_call_);
-
   // layer_ can be NULL if Init() wasn't invoked, which can happen
   // only in tests.
   if (layer_)
@@ -684,8 +680,6 @@ void Window::SetVisible(bool visible) {
   if (visible == layer_->GetTargetVisibility())
     return;  // No change.
 
-  AutoReset<bool> reseter(&in_set_visible_call_, true);
-
   RootWindow* root_window = GetRootWindow();
   if (client::GetVisibilityClient(root_window)) {
     client::GetVisibilityClient(root_window)->UpdateLayerVisibility(
diff --git a/ui/aura/window.h b/ui/aura/window.h
index ede2c71..f6a52e1 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -479,13 +479,6 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
 
   std::map<const void*, Value> prop_map_;
 
-  // A boolean flag to debug crash in http://crbug.com/134507. It is set when
-  // SetVisible is called and reset when SetVisible finishes. In Window dtor,
-  // the flag is CHECKed to catch the case that Window is destroyed during
-  // SetVisbile(false).
-  // TODO(xiyuan): Remove this when http://crbug.com/134507 is resolved.
-  bool in_set_visible_call_;
-
   DISALLOW_COPY_AND_ASSIGN(Window);
 };