Minor changes to allow Pepper InstancePrivate tests to pass with gin

ppapi/tests/test_instance_deprecated.cc

 // 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.
 
 #include "ppapi/tests/test_instance_deprecated.h"
 
 #include <assert.h>
 
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/cpp/module.h"
@@ skipping 22 matching lines @@
   TestInstance* test_instance_;
   // For out-of-process, the InstanceSO might be deleted after the instance was
   // already destroyed, so we can't rely on test_instance_->testing_interface()
   // being valid. Therefore we store our own.
   const PPB_Testing_Private* testing_interface_;
 };
 
 InstanceSO::InstanceSO(TestInstance* i)
     : test_instance_(i),
       testing_interface_(i->testing_interface()) {
-  // Set up a post-condition for the test so that we can ensure our destructor
-  // is called. This only works reliably in-process. Out-of-process, it only
-  // can work when the renderer stays alive a short while after the plugin
-  // instance is destroyed. If the renderer is being shut down, too much happens
-  // asynchronously for the out-of-process case to work reliably. In
-  // particular:
-  //   - The Var ReleaseObject message is asynchronous.
-  //   - The PPB_Var_Deprecated host-side proxy posts a task to actually release
-  //     the object when the ReleaseObject message is received.
-  //   - The PPP_Class Deallocate message is asynchronous.
-  // At time of writing this comment, if you modify the code so that the above
-  // happens synchronously, and you remove the restriction that the plugin can't
-  // be unblocked by a sync message, then this check actually passes reliably
-  // for out-of-process. But we don't want to make any of those changes, so we
-  // just skip the check.
-  if (testing_interface_->IsOutOfProcess() == PP_FALSE) {
-    i->instance()->AddPostCondition(

[dmichael (off chromium), 2014/08/20 17:55:53]

FWIW, I think this was the only usage of "AddPostCondition". We should probably
kill it off, though I don't mind if that's a separate CL.

-      "window.document.getElementById('container').instance_object_destroyed"
-      );
-  }
+  if (testing_interface_->IsOutOfProcess() == PP_FALSE)
+    test_instance_->set_instance_object_destroyed(false);
 }
 
 InstanceSO::~InstanceSO() {
-  if (testing_interface_->IsOutOfProcess() == PP_FALSE) {
-    // TODO(dmichael): It would probably be best to make in-process consistent
-    //                 with out-of-process. That would mean that the instance
-    //                 would already be destroyed at this point.
-    pp::Var ret = test_instance_->instance()->ExecuteScript(
-        "document.getElementById('container').instance_object_destroyed=true;");
-  } else {
-    // Out-of-process, this destructor might not actually get invoked. See the
-    // comment in InstanceSO's constructor for an explanation. Also, instance()
-    // has already been destroyed :-(. So we can't really do anything here.
-  }
+  test_instance_->set_instance_object_destroyed(true);
 }
 
 bool InstanceSO::HasMethod(const pp::Var& name, pp::Var* exception) {
   if (!name.is_string())
     return false;
   return name.AsString() == kSetValueFunction ||
          name.AsString() == kSetExceptionFunction ||
          name.AsString() == kReturnValueFunction;
 }
 
@@ skipping 23 matching lines @@
     *exception = pp::Var("Bad function call");
   }
 
   return pp::Var();
 }
 
 }  // namespace
 
 REGISTER_TEST_CASE(Instance);
 
-TestInstance::TestInstance(TestingInstance* instance) : TestCase(instance) {
-}
+TestInstance::TestInstance(TestingInstance* instance)
+    : TestCase(instance),
+      instance_object_destroyed_(false) {}
 
 bool TestInstance::Init() {
   return true;
 }
 
 TestInstance::~TestInstance() {
   ResetTestObject();
-  // When running tests in process, some post conditions check that teardown
-  // happened successfully. We need to run the garbage collector to ensure that
-  // vars get released.
-  if (testing_interface_->IsOutOfProcess() == PP_FALSE)
+  if (testing_interface_->IsOutOfProcess() == PP_FALSE) {
+    // This should cause the instance objects descructor to be called.
     testing_interface_->RunV8GC(instance_->pp_instance());
+
+    // Test a post-condition which ensures the instance objects destructor is
+    // called. This only works reliably in-process. Out-of-process, it only
+    // can work when the renderer stays alive a short while after the plugin
+    // instance is destroyed. If the renderer is being shut down, too much
+    // happens asynchronously for the out-of-process case to work reliably. In
+    // particular:
+    //   - The Var ReleaseObject message is asynchronous.
+    //   - The PPB_Var_Deprecated host-side proxy posts a task to actually
+    //     release the object when the ReleaseObject message is received.
+    //   - The PPP_Class Deallocate message is asynchronous.
+    // At time of writing this comment, if you modify the code so that the above
+    // happens synchronously, and you remove the restriction that the plugin
+    // can't be unblocked by a sync message, then this check actually passes
+    // reliably for out-of-process. But we don't want to make any of those
+    // changes so we just skip the check.
+    PP_DCHECK(instance_object_destroyed_);
+  } else {
+    // Out-of-process, this destructor might not actually get invoked. See the
+    // comment in InstanceSO's constructor for an explanation. Also, instance()
+    // has already been destroyed :-(. So we can't really do anything here.
+  }
+
   // Save the fact that we were destroyed in sessionStorage. This tests that
   // we can ExecuteScript at instance destruction without crashing. It also
   // allows us to check that ExecuteScript will run and succeed in certain
   // cases. In particular, when the instance is destroyed by normal DOM
   // deletion, ExecuteScript will actually work. See
   // TestExecuteScriptInInstanceShutdown for that test. Note, however, that
   // ExecuteScript will *not* have an effect when the instance is destroyed
   // because the renderer was shut down.
   pp::Var ret = instance()->ExecuteScript(
       "sessionStorage.setItem('instance_destroyed', 'true');");
@@ skipping 148 matching lines @@
   // that it was set as expected.
   pp::Var result = instance()->ExecuteScript(
       "sessionStorage.getItem('instance_destroyed');");
   ASSERT_TRUE(result.is_string());
   ASSERT_EQ(std::string("true"), result.AsString());
   instance()->ExecuteScript("sessionStorage.removeItem('instance_destroyed');");
 
   PASS();
 }