Changed location of LibsecretLoader

components/os_crypt/libsecret_util_posix.h

+// Copyright 2016 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 COMPONENTS_OS_CRYPT_LIBSECRET_UTIL_POSIX_H_
+#define COMPONENTS_OS_CRYPT_LIBSECRET_UTIL_POSIX_H_
+
+#include <libsecret/secret.h>
+
+#include <string>
+#include <vector>
+
+#include "base/macros.h"
+
+// Utility for dynamically loading libsecret.
+class LibsecretLoader {
+ public:
+  static decltype(&::secret_password_store_sync) secret_password_store_sync;
+  static decltype(&::secret_service_search_sync) secret_service_search_sync;
+  static decltype(&::secret_password_clear_sync) secret_password_clear_sync;
+  static decltype(&::secret_item_get_secret) secret_item_get_secret;
+  static decltype(&::secret_value_get_text) secret_value_get_text;
+  static decltype(&::secret_item_get_attributes) secret_item_get_attributes;
+  static decltype(&::secret_item_load_secret_sync) secret_item_load_secret_sync;
+  static decltype(&::secret_value_unref) secret_value_unref;
+
+  // Loads the libsecret binaries and checks that it responds to queries.

[vabr (Chromium), 2016/04/29 13:16:07]

nit: Plural "binaries" vs. singular "it". What about binaries -> library?

[cfroussios, 2016/04/29 14:00:52]

Done.

+  // False if either step fails.

[vabr (Chromium), 2016/04/29 13:16:07]

optional nit: "Returns false" instead of just "false"?

[cfroussios, 2016/04/29 14:00:52]

Returns is redundant, but let's go with the norm.
Done.

+  // Repeated calls check the responsiveness every time, but do not load the
+  // the library again if already successful.
+  static bool EnsureLibsecretLoaded() {
+    return LoadLibsecret() && LibsecretIsAvailable();

[vabr (Chromium), 2016/04/29 13:16:07]

Please do not inline this method, define it in the .cc file.
http://dev.chromium.org/developers/coding-style#TOC-Inline-functions

[cfroussios, 2016/04/29 14:00:52]

Done.

+  }
+
+ protected:
+  static bool libsecret_loaded;

[vabr (Chromium), 2016/04/29 13:16:07]

nit: Even static data members should have a trailing underscore in the name.
https://google.github.io/styleguide/cppguide.html#Variable_Names

[cfroussios, 2016/04/29 14:00:52]

Done.

+
+ private:
+  struct FunctionInfo {
+    const char* name;
+    void** pointer;
+  };
+
+  static const FunctionInfo functions[];

[vabr (Chromium), 2016/04/29 13:16:07]

nit: This is a constant, so let's call it kFunctions.

[cfroussios, 2016/04/29 14:00:52]

Done.

+
+  // Load the libsecret binaries. Returns true on success.
+  // If successful, the result is cached and the function can be safely called
+  // multiple times.
+  // Checking |LibsecretIsAvailable| is necessary after this to verify that the
+  // service responds to queries.
+  static bool LoadLibsecret();
+
+  // True if the libsecret binaries have been loaded and the library responds
+  // to queries.
+  static bool LibsecretIsAvailable();
+
+  DISALLOW_IMPLICIT_CONSTRUCTORS(LibsecretLoader);
+};
+
+class LibsecretAttributesBuilder {
+ public:
+  LibsecretAttributesBuilder();
+  ~LibsecretAttributesBuilder();
+
+  void Append(const std::string& name, const std::string& value);
+
+  void Append(const std::string& name, int64_t value);
+
+  // GHashTable, its keys and values returned from Get() are destroyed in
+  // |LibsecretAttributesBuilder| destructor.
+  GHashTable* Get() { return attrs_; }
+
+ private:
+  // |name_values_| is a storage for strings referenced in |attrs_|.
+  std::vector<std::string> name_values_;
+  GHashTable* attrs_;
+
+  DISALLOW_COPY_AND_ASSIGN(LibsecretAttributesBuilder);
+};
+
+#endif  // COMPONENTS_OS_CRYPT_LIBSECRET_UTIL_POSIX_H_