summaryrefslogtreecommitdiffstats
path: root/webkit/plugins
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 14:55:24 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 14:55:24 +0000
commit833b9979a7375a1787c28db54a9859cf73345e56 (patch)
treeded5851df9454fcfdaf34d0e5ac74986a088c73a /webkit/plugins
parentd4da94a2aa7d86dcff47539d284483f566669230 (diff)
downloadchromium_src-833b9979a7375a1787c28db54a9859cf73345e56.zip
chromium_src-833b9979a7375a1787c28db54a9859cf73345e56.tar.gz
chromium_src-833b9979a7375a1787c28db54a9859cf73345e56.tar.bz2
Add a non-null check for a pointer to NPAPIClient::ExecuteGetJavascriptUrlTest::TimerProc
BUG=106522 TEST=trybot Review URL: http://codereview.chromium.org/8817014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
-rw-r--r--webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc b/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc
index ea32fac..b3a390e 100644
--- a/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc
+++ b/webkit/plugins/npapi/test/plugin_get_javascript_url_test.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h"
#include "base/basictypes.h"
+#include "base/logging.h"
// url for "self".
#define SELF_URL "javascript:window.location+\"\""
@@ -67,6 +68,7 @@ void CALLBACK ExecuteGetJavascriptUrlTest::TimerProc(
ExecuteGetJavascriptUrlTest* this_instance =
reinterpret_cast<ExecuteGetJavascriptUrlTest*>
(::GetProp(window, L"Plugin_Instance"));
+ CHECK(this_instance);
::RemoveProp(window, L"Plugin_Instance");