Entering debugger scope should not make debugger active.

src/debug.cc

Index: src/debug.cc
diff --git a/src/debug.cc b/src/debug.cc
index c2b6e5bc159a2c1c508d30bd4160dac0be28bbc8..e2964a91f55d4daa5b267cb77c24fb3acc789da9 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -2977,21 +2977,16 @@ void Debug::SetMessageHandler(v8::Debug::MessageHandler handler) {
 
 
 void Debug::UpdateState() {
-  bool activate = message_handler_ != NULL ||
-                  !event_listener_.is_null() ||
-                  is_entered();
-  if (!is_active_ && activate) {
+  is_active_ = message_handler_ != NULL || !event_listener_.is_null();
+  if (is_active_ || is_entered()) {
     // Note that the debug context could have already been loaded to
     // bootstrap test cases.
     isolate_->compilation_cache()->Disable();
-    activate = Load();
-  } else if (is_loaded() && !activate) {
+    is_active_ = Load();
+  } else if (is_loaded() && !is_active_) {
     isolate_->compilation_cache()->Enable();
     Unload();
   }
-  is_active_ = activate;
-  // At this point the debug context is loaded iff the debugger is active.
-  ASSERT(is_loaded() == is_active());
 }