PPAPI: Really force-free NPObjects on Instance destruction.

ppapi/tests/test_case.h

 // Copyright (c) 2012 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.
 
 #ifndef PPAPI_TESTS_TEST_CASE_H_
 #define PPAPI_TESTS_TEST_CASE_H_
 
 #include <cmath>
 #include <limits>
+#include <set>
 #include <string>
 
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/cpp/dev/scrollbar_dev.h"
 #include "ppapi/cpp/view.h"
 
 #if (defined __native_client__)
 #include "ppapi/cpp/var.h"
 #else
@@ skipping 43 matching lines @@
   // A function that is invoked whenever DidChangeView is called on the
   // associated TestingInstance. Default implementation does nothing. TestCases
   // that want to handle view changes should override this method.
   virtual void DidChangeView(const pp::View& view);
 
   // A function that is invoked whenever HandleInputEvent is called on the
   // associated TestingInstance. Default implementation returns false. TestCases
   // that want to handle view changes should override this method.
   virtual bool HandleInputEvent(const pp::InputEvent& event);
 
+  void IgnoreLeakedVar(int64_t id);
+
+  TestingInstance* instance() { return instance_; }
+
+  const PPB_Testing_Dev* testing_interface() { return testing_interface_; }
+
  protected:
 #if !(defined __native_client__)
   // Overridden by each test to supply a ScriptableObject corresponding to the
-  // test. There can only be one object created for all test in a given class
+  // test. There can only be one object created for all tests in a given class,
   // so be sure your object is designed to be re-used.
   //
   // This object should be created on the heap. Ownership will be passed to the
   // caller. Return NULL if there is no supported test object (the default).
   virtual pp::deprecated::ScriptableObject* CreateTestObject();
 #endif
 
   // Checks whether the testing interface is available. Returns true if it is,
   // false otherwise. If it is not available, adds a descriptive error. This is
   // for use by tests that require the testing interface.
@@ skipping 14 matching lines @@
   // Pointer to the instance that owns us.
   TestingInstance* instance_;
 
   // NULL unless InitTestingInterface is called.
   const PPB_Testing_Dev* testing_interface_;
 
   // Force asynchronous completion of any operation taking a callback.
   bool force_async_;
 
  private:
+  // Var ids that should be ignored when checking for leaks on shutdown.
+  std::set<int64_t> ignored_leaked_vars_;
+
 #if !(defined __native_client__)
   // Holds the test object, if any was retrieved from CreateTestObject.
   pp::VarPrivate test_object_;
 #endif
 };
 
 // This class is an implementation detail.
 class TestCaseFactory {
  public:
   typedef TestCase* (*Method)(TestingInstance* instance);
@@ skipping 81 matching lines @@
 #define ASSERT_FALSE(cmd) ASSERT_TRUE(!(cmd))
 #define ASSERT_EQ(a, b) ASSERT_TRUE((a) == (b))
 #define ASSERT_NE(a, b) ASSERT_TRUE((a) != (b))
 
 #define ASSERT_DOUBLE_EQ(a, b) ASSERT_TRUE( \
     std::fabs((a)-(b)) <= std::numeric_limits<double>::epsilon())
 
 #define PASS() return std::string()
 
 #endif  // PPAPI_TESTS_TEST_CASE_H_