Remove function casting from Libsecret tests

components/os_crypt/key_storage_libsecret_unittest.cc

Index: components/os_crypt/key_storage_libsecret_unittest.cc
diff --git a/components/os_crypt/key_storage_libsecret_unittest.cc b/components/os_crypt/key_storage_libsecret_unittest.cc
index e8e27ee6d65578a9696138e97df358e4cc9fbd9d..317db96a25d630a92ac5df51e7ff82d5b12e50f4 100644
--- a/components/os_crypt/key_storage_libsecret_unittest.cc
+++ b/components/os_crypt/key_storage_libsecret_unittest.cc
@@ -53,7 +53,7 @@ class MockLibsecretLoader : public LibsecretLoader {
 
  private:
   // These methods are used to redirect calls through LibsecretLoader
-  static const gchar* mock_secret_value_get_text(MockSecretValue* value);
+  static const gchar* mock_secret_value_get_text(SecretValue* value);
 
   static gboolean mock_secret_password_store_sync(const SecretSchema* schema,
                                                   const gchar* collection,
@@ -77,7 +77,7 @@ class MockLibsecretLoader : public LibsecretLoader {
                                                   GError** error,
                                                   ...);
 
-  static MockSecretValue* mock_secret_item_get_secret(MockSecretItem* item);
+  static SecretValue* mock_secret_item_get_secret(SecretItem* item);
 
   // MockLibsecretLoader owns these objects.
   static MockSecretValue* stored_password_mock_ptr_;
@@ -88,8 +88,9 @@ MockSecretValue* MockLibsecretLoader::stored_password_mock_ptr_ = nullptr;
 MockSecretValue* MockLibsecretLoader::deprecated_password_mock_ptr_ = nullptr;
 
 const gchar* MockLibsecretLoader::mock_secret_value_get_text(
-    MockSecretValue* value) {
-  return value->c_str();
+    SecretValue* value) {
+  MockSecretValue* mock_value = reinterpret_cast<MockSecretValue*>(value);
+  return mock_value->c_str();
 }
 
 // static
@@ -151,9 +152,9 @@ gboolean MockLibsecretLoader::mock_secret_password_clear_sync(
 }
 
 // static
-MockSecretValue* MockLibsecretLoader::mock_secret_item_get_secret(
-    MockSecretItem* item) {
-  return item;
+SecretValue* MockLibsecretLoader::mock_secret_item_get_secret(
+    SecretItem* item) {
+  return reinterpret_cast<SecretValue*>(item);

[vasilii, 2016/10/25 11:42:57]

static_assert(std::is_same<MockSecretValue, MockSecretItem>::value, "bla bla
bla");

[cfroussios, 2016/10/25 12:14:40]

Done.

 }
 
 // static
@@ -161,13 +162,11 @@ bool MockLibsecretLoader::ResetForOSCrypt() {
   // Methods used by KeyStorageLibsecret
   secret_password_store_sync =
       &MockLibsecretLoader::mock_secret_password_store_sync;
-  secret_value_get_text = (decltype(&::secret_value_get_text)) &
-                          MockLibsecretLoader::mock_secret_value_get_text;
+  secret_value_get_text = &MockLibsecretLoader::mock_secret_value_get_text;
   secret_value_unref = &MockLibsecretLoader::mock_secret_value_unref;
   secret_service_search_sync =
       &MockLibsecretLoader::mock_secret_service_search_sync;
-  secret_item_get_secret =
-      (decltype(&::secret_item_get_secret))mock_secret_item_get_secret;
+  secret_item_get_secret = &MockLibsecretLoader::mock_secret_item_get_secret;
   // Used by Migrate()
   secret_password_clear_sync =
       &MockLibsecretLoader::mock_secret_password_clear_sync;