Rename ActiveDOMObject to SuspendableObject

content/shell/renderer/layout_test/leak_detector.cc

Index: content/shell/renderer/layout_test/leak_detector.cc
diff --git a/content/shell/renderer/layout_test/leak_detector.cc b/content/shell/renderer/layout_test/leak_detector.cc
index bc8de7e5449d18443d6618b92c89e1d6b8cd107d..302a121bb97edee096a9025cafd6b2d500a95579 100644
--- a/content/shell/renderer/layout_test/leak_detector.cc
+++ b/content/shell/renderer/layout_test/leak_detector.cc
@@ -30,9 +30,9 @@ const int kInitialNumberOfScriptPromises = 0;
 const int kInitialNumberOfLiveFrames = 1;
 const int kInitialNumberOfWorkerGlobalScopes = 0;
 
-// In the initial state, there are two ActiveDOMObjects (FontFaceSet created by
-// HTMLDocument and SuspendableTimer created by DocumentLoader).
-const int kInitialNumberOfLiveActiveDOMObject = 2;
+// In the initial state, there are two SuspendableObjects (FontFaceSet created
+// by HTMLDocument and SuspendableTimer created by DocumentLoader).
+const int kInitialNumberOfLiveSuspendableObject = 2;
 
 // This includes not only about:blank's context but also ScriptRegexp (e.g.
 // created by isValidEmailAddress in EmailInputType.cpp). The leak detector
@@ -49,8 +49,8 @@ LeakDetector::LeakDetector(BlinkTestRunner* test_runner)
   previous_result_.numberOfLiveLayoutObjects =
       kInitialNumberOfLiveLayoutObjects;
   previous_result_.numberOfLiveResources = kInitialNumberOfLiveResources;
-  previous_result_.numberOfLiveActiveDOMObjects =
-    kInitialNumberOfLiveActiveDOMObject;
+  previous_result_.numberOfLiveSuspendableObjects =
+    kInitialNumberOfLiveSuspendableObject;
   previous_result_.numberOfLiveScriptPromises = kInitialNumberOfScriptPromises;
   previous_result_.numberOfLiveFrames = kInitialNumberOfLiveFrames;
   previous_result_.numberOfLiveV8PerContextData =
@@ -104,12 +104,12 @@ void LeakDetector::onLeakDetectionComplete(
     list->AppendInteger(result.numberOfLiveResources);
     detail.Set("numberOfLiveResources", list);
   }
-  if (previous_result_.numberOfLiveActiveDOMObjects <
-      result.numberOfLiveActiveDOMObjects) {
+  if (previous_result_.numberOfLiveSuspendableObjects <
+      result.numberOfLiveSuspendableObjects) {
     base::ListValue* list = new base::ListValue();
-    list->AppendInteger(previous_result_.numberOfLiveActiveDOMObjects);
-    list->AppendInteger(result.numberOfLiveActiveDOMObjects);
-    detail.Set("numberOfLiveActiveDOMObjects", list);
+    list->AppendInteger(previous_result_.numberOfLiveSuspendableObjects);
+    list->AppendInteger(result.numberOfLiveSuspendableObjects);
+    detail.Set("numberOfLiveSuspendableObjects", list);
   }
   if (previous_result_.numberOfLiveScriptPromises <
       result.numberOfLiveScriptPromises) {