| Index: content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
|
| diff --git a/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp b/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
|
| index 492536b32534727ad73a71ca86c23d5dfc74f888..f98ef5c0662797251164a599c23ed47c7404f2ee 100644
|
| --- a/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
|
| +++ b/content/shell/tools/plugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
|
| @@ -44,8 +44,7 @@ private:
|
| // This is the test object.
|
| class TestObject : public Object<TestObject> {
|
| public:
|
| - virtual ~TestObject()
|
| - {
|
| + ~TestObject() override {
|
| if (wasShutdownCalled)
|
| indicateTestFailure();
|
| }
|
| @@ -70,19 +69,18 @@ private:
|
| }
|
| };
|
|
|
| - virtual NPError NPP_New(NPMIMEType pluginType,
|
| - uint16_t mode,
|
| - int16_t argc,
|
| - char* argn[],
|
| - char* argv[],
|
| - NPSavedData* saved) override {
|
| + NPError NPP_New(NPMIMEType pluginType,
|
| + uint16_t mode,
|
| + int16_t argc,
|
| + char* argn[],
|
| + char* argv[],
|
| + NPSavedData* saved) override {
|
| registerNPShutdownFunction(shutdown);
|
|
|
| return NPERR_NO_ERROR;
|
| }
|
|
|
| - virtual NPError NPP_GetValue(NPPVariable variable, void *value) override
|
| - {
|
| + NPError NPP_GetValue(NPPVariable variable, void* value) override {
|
| if (variable != NPPVpluginScriptableNPObject)
|
| return NPERR_GENERIC_ERROR;
|
|
|
|
|