Deprecate DLOPEN_GNOME_KEYRING flag

chrome/browser/password_manager/native_backend_gnome_x_unittest.cc

 // 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.
 
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <utility>
@@ skipping 260 matching lines @@
 }
 
 const gchar* mock_gnome_keyring_result_to_message(GnomeKeyringResult res) {
   return "mock keyring simulating failure";
 }
 
 // Inherit to get access to protected fields.
 class MockGnomeKeyringLoader : public GnomeKeyringLoader {
  public:
   static bool LoadMockGnomeKeyring() {
-    if (!LoadGnomeKeyring())
-      return false;
 #define GNOME_KEYRING_ASSIGN_POINTER(name) \
   gnome_keyring_##name = &mock_gnome_keyring_##name;
     GNOME_KEYRING_FOR_EACH_MOCKED_FUNC(GNOME_KEYRING_ASSIGN_POINTER)
 #undef GNOME_KEYRING_ASSIGN_POINTER
+
+#define GNOME_KEYRING_ASSIGN_POINTER(name) \
+  gnome_keyring_##name = &::gnome_keyring_##name;
+    GNOME_KEYRING_FOR_EACH_NON_MOCKED_FUNC(GNOME_KEYRING_ASSIGN_POINTER)
+#undef GNOME_KEYRING_ASSIGN_POINTER

[vasilii, 2016/07/28 13:33:22]

It looks complex. If you find a way to get rid of this code style (in a
follow-up CL) it will be great.

[cfroussios, 2016/07/28 16:06:39]

Acknowledged.

+
     keyring_loaded = true;
     // Reset the state of the mock library.
     mock_keyring_items.clear();
     mock_keyring_reject_local_ids = false;
     return true;
   }
 };
 
 void CheckPasswordChanges(const PasswordStoreChangeList& expected_list,
                           const PasswordStoreChangeList& actual_list) {
@@ skipping 992 matching lines @@
       base::Bind(&CheckTrue));
 
   RunBothThreads();
 
   EXPECT_EQ(2u, form_list.size());
   EXPECT_THAT(form_list, UnorderedElementsAre(Pointee(form_google_),
                                               Pointee(form_facebook_)));
 }
 
 // TODO(mdm): add more basic tests here at some point.