Revert 97925 - Linux: allow linking directly with Kerberos instead of using dlopen.

net/http/http_auth_gssapi_posix.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_AUTH_GSSAPI_POSIX_H_
 #define NET_HTTP_HTTP_AUTH_GSSAPI_POSIX_H_
 #pragma once
 
-#include <gssapi.h>
-
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/native_library.h"
 #include "base/string16.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth.h"
 
+#define GSS_USE_FUNCTION_POINTERS
+#include "net/third_party/gssapi/gssapi.h"
+
 namespace net {
 
 NET_EXPORT_PRIVATE extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE_X;
 NET_EXPORT_PRIVATE extern gss_OID CHROME_GSS_C_NT_HOSTBASED_SERVICE;
 NET_EXPORT_PRIVATE extern gss_OID CHROME_GSS_KRB5_MECH_OID_DESC;
 
 // GSSAPILibrary is introduced so unit tests can mock the calls to the GSSAPI
 // library. The default implementation attempts to load one of the standard
 // GSSAPI library implementations, then simply passes the arguments on to
 // that implementation.
@@ skipping 131 matching lines @@
       const gss_ctx_id_t context_handle,
       gss_name_t* src_name,
       gss_name_t* targ_name,
       OM_uint32* lifetime_rec,
       gss_OID* mech_type,
       OM_uint32* ctx_flags,
       int* locally_initiated,
       int* open);
 
  private:
-  typedef typeof(&gss_import_name) gss_import_name_type;
-  typedef typeof(&gss_release_name) gss_release_name_type;
-  typedef typeof(&gss_release_buffer) gss_release_buffer_type;
-  typedef typeof(&gss_display_name) gss_display_name_type;
-  typedef typeof(&gss_display_status) gss_display_status_type;
-  typedef typeof(&gss_init_sec_context) gss_init_sec_context_type;
-  typedef typeof(&gss_wrap_size_limit) gss_wrap_size_limit_type;
-  typedef typeof(&gss_delete_sec_context) gss_delete_sec_context_type;
-  typedef typeof(&gss_inquire_context) gss_inquire_context_type;
-
   FRIEND_TEST_ALL_PREFIXES(HttpAuthGSSAPIPOSIXTest, GSSAPIStartup);
 
   bool InitImpl();
   // Finds a usable dynamic library for GSSAPI and loads it.  The criteria are:
   //   1. The library must exist.
   //   2. The library must export the functions we need.
   base::NativeLibrary LoadSharedLibrary();
   bool BindMethods(base::NativeLibrary lib);
 
   bool initialized_;
@@ skipping 74 matching lines @@
   gss_OID gss_oid_;
   GSSAPILibrary* library_;
   std::string decoded_server_auth_token_;
   ScopedSecurityContext scoped_sec_context_;
   bool can_delegate_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_GSSAPI_POSIX_H_