Expanded GnomeKeyringLoader macros

chrome/browser/password_manager/native_backend_gnome_x.h

 // Copyright (c) 2012 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 CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
 
 // libgnome-keyring has been deprecated in favor of libsecret.
 // See: https://mail.gnome.org/archives/commits-list/2013-October/msg08876.html
 //
@@ skipping 24 matching lines @@
 // them difficult if not impossible to truly wrap in C. Therefore, we use
 // appropriately-typed function pointers and scoping to make the fact that we
 // might be dynamically loading the library almost invisible. As a bonus, we
 // also get a simple way to mock the library for testing. Classes that inherit
 // from GnomeKeyringLoader will use its versions of the gnome_keyring_*
 // functions. Note that it has only static fields.
 class GnomeKeyringLoader {
  protected:
   static bool LoadGnomeKeyring();
 
-// Call a given parameter with the name of each function we use from GNOME
-// Keyring. Make sure to adjust the unit test if you change these.
-// The list of functions is divided into those we plan to mock in the unittest,
-// and those which we use without mocking in the test.
-#define GNOME_KEYRING_FOR_EACH_MOCKED_FUNC(F)      \
-  F(is_available)                                  \
-  F(store_password)                                \
-  F(delete_password)                               \
-  F(find_items)                                    \
-  F(result_to_message)
-#define GNOME_KEYRING_FOR_EACH_NON_MOCKED_FUNC(F)  \
-  F(attribute_list_free)                           \
-  F(attribute_list_new)                            \
-  F(attribute_list_append_string)                  \
-  F(attribute_list_append_uint32)
-#define GNOME_KEYRING_FOR_EACH_FUNC(F)             \
-  GNOME_KEYRING_FOR_EACH_NON_MOCKED_FUNC(F)        \
-  GNOME_KEYRING_FOR_EACH_MOCKED_FUNC(F)
-
-// Declare the actual function pointers that we'll use in client code.
-#define GNOME_KEYRING_DECLARE_POINTER(name) \
-    static decltype(&::gnome_keyring_##name) gnome_keyring_##name;
-  GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DECLARE_POINTER)
-#undef GNOME_KEYRING_DECLARE_POINTER
+  // Declare the actual function pointers that we'll use in client code.
+  static decltype(&::gnome_keyring_is_available) gnome_keyring_is_available;

[vasilii, 2016/08/01 09:51:26]

Do you deliberately reuse the same names? 

[cfroussios, 2016/08/01 10:54:52]

That's the names that the macros would produce. Are you suggesting that we
should rename the functions? We could definitely drop the prefix.

[vasilii, 2016/08/01 11:46:37]

I'd use gnome_keyring_is_available_ptr. I'm totally fine with dropping the
prefix too.

[cfroussios, 2016/08/01 14:31:04]

I used ptr. I didn't get rid of the prefix, because then some functions, e.g.
GnomeKeyringLoader::is_available_ptr(), could be read as if querying the state
of the loader, instead of the library.

+  static decltype(&::gnome_keyring_store_password) gnome_keyring_store_password;
+  static decltype(
+      &::gnome_keyring_delete_password) gnome_keyring_delete_password;
+  static decltype(&::gnome_keyring_find_items) gnome_keyring_find_items;
+  static decltype(
+      &::gnome_keyring_result_to_message) gnome_keyring_result_to_message;
+  static decltype(
+      &::gnome_keyring_attribute_list_free) gnome_keyring_attribute_list_free;
+  static decltype(
+      &::gnome_keyring_attribute_list_new) gnome_keyring_attribute_list_new;
+  static decltype(&::gnome_keyring_attribute_list_append_string)
+      gnome_keyring_attribute_list_append_string;
+  static decltype(&::gnome_keyring_attribute_list_append_uint32)
+      gnome_keyring_attribute_list_append_uint32;
 
   // Set to true if LoadGnomeKeyring() has already succeeded.
   static bool keyring_loaded;
 
  private:
   struct FunctionInfo {
     const char* name;
     void** pointer;
   };
 
@@ skipping 67 matching lines @@
                            TimestampToCompare date_to_compare,
                            password_manager::PasswordStoreChangeList* changes);
 
   // The app string, possibly based on the local profile id.
   std::string app_string_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeBackendGnome);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_