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

Unified Diff: chrome_frame/test_utils.cc

Issue 7276037: Remove NPAPI support from Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/test_with_web_server.cc ('k') | chrome_frame/utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test_utils.cc
===================================================================
--- chrome_frame/test_utils.cc (revision 90713)
+++ chrome_frame/test_utils.cc (working copy)
@@ -78,20 +78,6 @@
ASSERT_TRUE(register_server != NULL);
EXPECT_HRESULT_SUCCEEDED((*register_server)());
- DllRegisterServerFn register_npapi_server = NULL;
- if (registration_type == PER_USER) {
- register_npapi_server =
- reinterpret_cast<DllRegisterServerFn>(GetProcAddress(
- dll_handle, "RegisterNPAPIUserPlugin"));
- } else {
- register_npapi_server =
- reinterpret_cast<DllRegisterServerFn>(GetProcAddress(
- dll_handle, "RegisterNPAPIPlugin"));
- }
-
- if (register_npapi_server != NULL)
- EXPECT_HRESULT_SUCCEEDED((*register_npapi_server)());
-
ASSERT_TRUE(FreeLibrary(dll_handle));
}
@@ -115,20 +101,6 @@
ASSERT_TRUE(unregister_server != NULL);
EXPECT_HRESULT_SUCCEEDED((*unregister_server)());
- DllUnregisterServerFn unregister_npapi_server = NULL;
- if (registration_type == PER_USER) {
- unregister_npapi_server =
- reinterpret_cast<DllUnregisterServerFn>(GetProcAddress(
- dll_handle, "UnregisterNPAPIUserPlugin"));
- } else {
- unregister_npapi_server =
- reinterpret_cast<DllUnregisterServerFn>(GetProcAddress(
- dll_handle, "UnregisterNPAPIPlugin"));
- }
-
- if (unregister_npapi_server != NULL)
- EXPECT_HRESULT_SUCCEEDED((*unregister_npapi_server)());
-
ASSERT_TRUE(FreeLibrary(dll_handle));
}
« no previous file with comments | « chrome_frame/test/test_with_web_server.cc ('k') | chrome_frame/utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698