Re-land http://codereview.chromium.org/9403039/, r124106

ppapi/tests/test_case.cc

 // Copyright (c) 2011 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 "ppapi/tests/test_case.h"
 
 #include <sstream>
 
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
@@ skipping 29 matching lines @@
 
   std::ostringstream output;
   output << "Failure in " << file << "(" << line << "): " << cmd;
   return output.str();
 }
 
 #if !(defined __native_client__)
 pp::VarPrivate TestCase::GetTestObject() {
   if (test_object_.is_undefined()) {
     pp::deprecated::ScriptableObject* so = CreateTestObject();
-    if (so)
+    if (so) {
       test_object_ = pp::VarPrivate(instance_, so);  // Takes ownership.
+      // CheckResourcesAndVars runs and looks for leaks before we've actually
+      // completely shut down. Ignore the instance object, since it's not a real
+      // leak.
+      IgnoreLeakedVar(test_object_.pp_var().value.as_id);
+    }
   }
   return test_object_;
 }
 #endif
 
 bool TestCase::CheckTestingInterface() {
   testing_interface_ = GetTestingInterface();
   if (!testing_interface_) {
     // Give a more helpful error message for the testing interface being gone
     // since that needs special enabling in Chrome.
     instance_->AppendError("This test needs the testing interface, which is "
                            "not currently available. In Chrome, use "
                            "--enable-pepper-testing when launching.");
     return false;
   }
 
   return true;
 }
 
 void TestCase::HandleMessage(const pp::Var& message_data) {
 }
 
 void TestCase::DidChangeView(const pp::View& view) {
 }
 
 bool TestCase::HandleInputEvent(const pp::InputEvent& event) {
   return false;
 }
 
+void TestCase::IgnoreLeakedVar(int64_t id) {
+  ignored_leaked_vars_.insert(id);
+}
+
 #if !(defined __native_client__)
 pp::deprecated::ScriptableObject* TestCase::CreateTestObject() {
   return NULL;
 }
 #endif
 
 bool TestCase::EnsureRunningOverHTTP() {
   if (instance_->protocol() != "http:") {
     instance_->AppendError("This test needs to be run over HTTP.");
     return false;
@@ skipping 13 matching lines @@
     // TODO(dmichael): Fix tests that leak resources and enable the following:
     /*
     uint32_t leaked_resources =
         testing_interface_->GetLiveObjectsForInstance(instance_->pp_instance());
     if (leaked_resources) {
       std::ostringstream output;
       output << "FAILED: Test leaked " << leaked_resources << " resources.\n";
       errors += output.str();
     }
     */
-    const uint32_t kVarsToPrint = 10;
+    const int kVarsToPrint = 100;
     PP_Var vars[kVarsToPrint];
-    uint32_t leaked_vars = testing_interface_->GetLiveVars(vars, kVarsToPrint);
-    uint32_t tracked_vars = leaked_vars;
-#if !(defined __native_client__)
-    // Don't count test_object_ as a leak.
-    if (test_object_.pp_var().type > PP_VARTYPE_DOUBLE)
-      --leaked_vars;
-#endif
-    if (leaked_vars) {
+    int found_vars = testing_interface_->GetLiveVars(vars, kVarsToPrint);
+    // This will undercount if we are told to ignore a Var which is then *not*
+    // leaked. Worst case, we just won't print the little "Test leaked" message,
+    // but we'll still print any non-ignored leaked vars we found.
+    int leaked_vars =
+        found_vars - static_cast<int>(ignored_leaked_vars_.size());
+    if (leaked_vars > 0) {
       std::ostringstream output;
       output << "Test leaked " << leaked_vars << " vars (printing at most "
              << kVarsToPrint <<"):<p>";
       errors += output.str();
-      for (uint32_t i = 0; i < std::min(tracked_vars, kVarsToPrint); ++i) {
-        pp::Var leaked_var(pp::PASS_REF, vars[i]);
-#if (defined __native_client__)
+    }
+    for (int i = 0; i < std::min(found_vars, kVarsToPrint); ++i) {
+      pp::Var leaked_var(pp::PASS_REF, vars[i]);
+      if (ignored_leaked_vars_.count(leaked_var.pp_var().value.as_id) == 0)
         errors += leaked_var.DebugString() + "<p>";
-#else
-        if (!(leaked_var == test_object_))
-          errors += leaked_var.DebugString() + "<p>";
-#endif
-      }
     }
   }
   return errors;
 }
 
+