Move asserts for tracking global object detachment to WindowProxy.

third_party/WebKit/Source/bindings/core/v8/RemoteWindowProxy.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 52 matching lines @@
       // TODO(yukishiino): This DCHECK failed on Canary (M57) and Dev (M56).
       // We need to figure out why m_globalProxy != context->Global().
       DCHECK(m_globalProxy == context->Global());
       DCHECK_EQ(toScriptWrappable(context->Global()),
                 toScriptWrappable(
                     context->Global()->GetPrototype().As<v8::Object>()));
       m_globalProxy.get().SetWrapperClassId(0);
     }
     V8DOMWrapper::clearNativeInfo(isolate(), context->Global());
     m_scriptState->detachGlobalObject();
+
+#if DCHECK_IS_ON()
+    didDetachGlobalProxy();
+#endif
   }
 
   m_scriptState->disposePerContextData();
 
   // It's likely that disposing the context has created a lot of
   // garbage. Notify V8 about this so it'll have a chance of cleaning
   // it up when idle.
   V8GCForContextDispose::instance().notifyContextDisposed(
       frame()->isMainFrame());
 
@@ skipping 60 matching lines @@
   v8::Local<v8::Context> context = m_scriptState->context();
 
   // The global proxy object.  Note this is not the global object.
   v8::Local<v8::Object> globalProxy = context->Global();
   CHECK(m_globalProxy == globalProxy);
   V8DOMWrapper::setNativeInfo(isolate(), globalProxy, wrapperTypeInfo, window);
   // Mark the handle to be traced by Oilpan, since the global proxy has a
   // reference to the DOMWindow.
   m_globalProxy.get().SetWrapperClassId(wrapperTypeInfo->wrapperClassId);
 
+#if DCHECK_IS_ON()
+  didAttachGlobalProxy();
+#endif
+
   // The global object, aka window wrapper object.
   v8::Local<v8::Object> windowWrapper =
       globalProxy->GetPrototype().As<v8::Object>();
   windowWrapper = V8DOMWrapper::associateObjectWithWrapper(
       isolate(), window, wrapperTypeInfo, windowWrapper);
 
   // The prototype object of Window interface.
   v8::Local<v8::Object> windowPrototype =
       windowWrapper->GetPrototype().As<v8::Object>();
   CHECK(!windowPrototype.IsEmpty());
   V8DOMWrapper::setNativeInfo(isolate(), windowPrototype, wrapperTypeInfo,
                               window);
 
   // The named properties object of Window interface.
   v8::Local<v8::Object> windowProperties =
       windowPrototype->GetPrototype().As<v8::Object>();
   CHECK(!windowProperties.IsEmpty());
   V8DOMWrapper::setNativeInfo(isolate(), windowProperties, wrapperTypeInfo,
                               window);
 }
 
 }  // namespace blink