Superset of Nacl Keepalive patch & tests - NOT FOR LANDING DIRECTLY.

ppapi/thunk/enter.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/thunk/enter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 14 matching lines @@
 
 }  // namespace
 
 namespace thunk {
 
 namespace subtle {
 
 EnterBase::EnterBase()
     : resource_(NULL),
       retval_(PP_OK) {
+  PpapiGlobals::Get()->MarkPluginIsActive();
 }
 
 EnterBase::EnterBase(PP_Resource resource)
     : resource_(GetResource(resource)),
       retval_(PP_OK) {
+  PpapiGlobals::Get()->MarkPluginIsActive();
 }
 
 EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id)
     : resource_(GetSingletonResource(instance, resource_id)),
       retval_(PP_OK) {
+  PpapiGlobals::Get()->MarkPluginIsActive();
 }
 
 EnterBase::EnterBase(PP_Resource resource,
                      const PP_CompletionCallback& callback)
     : resource_(GetResource(resource)),
       retval_(PP_OK) {
   callback_ = new TrackedCallback(resource_, callback);
+  PpapiGlobals::Get()->MarkPluginIsActive();
 }
 
 EnterBase::EnterBase(PP_Instance instance, SingletonResourceID resource_id,
                      const PP_CompletionCallback& callback)
     : resource_(GetSingletonResource(instance, resource_id)),
       retval_(PP_OK) {
   DCHECK(resource_ || !instance);
   if (!resource_)
     retval_ = PP_ERROR_BADARGUMENT;
   callback_ = new TrackedCallback(resource_, callback);
+  PpapiGlobals::Get()->MarkPluginIsActive();
 }
 
 EnterBase::~EnterBase() {
   // callback_ is cleared any time it is run, scheduled to be run, or once we
   // know it will be completed asynchronously. So by this point it should be
   // NULL.
   DCHECK(!callback_.get())
       << "|callback_| is not NULL. Did you forget to call "
          "|EnterBase::SetResult| in the interface's thunk?";
 }
@@ skipping 233 matching lines @@
     : EnterBase(),
       functions_(PpapiGlobals::Get()->GetResourceCreationAPI(instance)) {
   SetStateForFunctionError(instance, functions_, true);
 }
 
 EnterResourceCreationNoLock::~EnterResourceCreationNoLock() {
 }
 
 }  // namespace thunk
 }  // namespace ppapi