Rename ActiveDOMObject to SuspendableObject

content/shell/renderer/layout_test/leak_detector.cc

 // Copyright 2014 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.
 
 #include "content/shell/renderer/layout_test/leak_detector.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
@@ skipping 12 matching lines @@
 // layout tests actually and initialize LeakDetector by the got values.
 const int kInitialNumberOfLiveAudioNodes = 0;
 const int kInitialNumberOfLiveDocuments = 1;
 const int kInitialNumberOfLiveNodes = 4;
 const int kInitialNumberOfLiveLayoutObjects = 3;
 const int kInitialNumberOfLiveResources = 0;
 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
 // always creates the latter to stabilize the number of V8PerContextData
 // objects.
 const int kInitialNumberOfV8PerContextData = 2;
 
 LeakDetector::LeakDetector(BlinkTestRunner* test_runner)
     : test_runner_(test_runner),
       web_leak_detector_(blink::WebLeakDetector::create(this)) {
   previous_result_.numberOfLiveAudioNodes = kInitialNumberOfLiveAudioNodes;
   previous_result_.numberOfLiveDocuments = kInitialNumberOfLiveDocuments;
   previous_result_.numberOfLiveNodes = kInitialNumberOfLiveNodes;
   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 =
     kInitialNumberOfV8PerContextData;
   previous_result_.numberOfWorkerGlobalScopes =
     kInitialNumberOfWorkerGlobalScopes;
 }
 
 LeakDetector::~LeakDetector() {
 }
@@ skipping 33 matching lines @@
     list->AppendInteger(previous_result_.numberOfLiveLayoutObjects);
     list->AppendInteger(result.numberOfLiveLayoutObjects);
     detail.Set("numberOfLiveLayoutObjects", list);
   }
   if (previous_result_.numberOfLiveResources < result.numberOfLiveResources) {
     base::ListValue* list = new base::ListValue();
     list->AppendInteger(previous_result_.numberOfLiveResources);
     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) {
     base::ListValue* list = new base::ListValue();
     list->AppendInteger(previous_result_.numberOfLiveScriptPromises);
     list->AppendInteger(result.numberOfLiveScriptPromises);
     detail.Set("numberOfLiveScriptPromises", list);
   }
   if (previous_result_.numberOfLiveFrames < result.numberOfLiveFrames) {
     base::ListValue* list = new base::ListValue();
@@ skipping 21 matching lines @@
     base::JSONWriter::Write(detail, &detail_str);
     report.detail = detail_str;
     report.leaked = true;
   }
 
   previous_result_ = result;
   test_runner_->ReportLeakDetectionResult(report);
 }
 
 }  // namespace content