| 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));
|
| }
|
|
|
|
|