Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc

Issue 6816024: Revert 80819 due to failed tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/user_agent.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/compiler_specific.h" 6 #include "base/compiler_specific.h"
7 7
8 #if defined(OS_WIN)
9 #define STRSAFE_NO_DEPRECATE
10 #include <strsafe.h>
11 #endif
8 #include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h" 12 #include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h"
9 13
10 namespace NPAPIClient { 14 namespace NPAPIClient {
11 15
12 NPObjectProxyTest::NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions) 16 NPObjectProxyTest::NPObjectProxyTest(NPP id, NPNetscapeFuncs *host_functions)
13 : PluginTest(id, host_functions) { 17 : PluginTest(id, host_functions) {
14 } 18 }
15 19
16 NPError NPObjectProxyTest::SetWindow(NPWindow* pNPWindow) { 20 NPError NPObjectProxyTest::SetWindow(NPWindow* pNPWindow) {
17 if (pNPWindow->window == NULL) 21 if (pNPWindow->window == NULL)
(...skipping 20 matching lines...) Expand all
38 NPVariant v; 42 NPVariant v;
39 HostFunctions()->invoke(id(), doc, append_child_id, &textv, 1, &v); 43 HostFunctions()->invoke(id(), doc, append_child_id, &textv, 1, &v);
40 44
41 // If this test failed, then we'd have crashed by now. 45 // If this test failed, then we'd have crashed by now.
42 SignalTestCompleted(); 46 SignalTestCompleted();
43 47
44 return NPERR_NO_ERROR; 48 return NPERR_NO_ERROR;
45 } 49 }
46 50
47 } // namespace NPAPIClient 51 } // namespace NPAPIClient
OLDNEW
« no previous file with comments | « webkit/glue/user_agent.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698