Changed location of LibsecretLoader

components/os_crypt/os_crypt_posix_util_libsecret.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_LOADER_H_

[vabr (Chromium), 2016/04/28 14:42:13]

nit: Don't forget to update the #include guard.
(If you run "git cl lint", it will even tell you which one you should use.)

[cfroussios, 2016/04/28 16:26:57]

Done.

+#define COMPONENTS_OS_CRYPT_LIBSECRET_LOADER_H_
+
+#include <libsecret/secret.h>
+
+#include <list>
+#include <string>
+
+#include "base/macros.h"
+
+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;
+
+ protected:
+  LibsecretLoader() = default;
+
+  static bool LoadLibsecret();
+  static bool LibsecretIsAvailable();
+
+  static bool libsecret_loaded;
+
+ private:
+  struct FunctionInfo {
+    const char* name;
+    void** pointer;
+  };
+
+  static const FunctionInfo functions[];
+
+  DISALLOW_COPY_AND_ASSIGN(LibsecretLoader);
+};
+
+class LibsecretAttributesBuilder {
+ public:
+  LibsecretAttributesBuilder();
+  ~LibsecretAttributesBuilder();
+  void Append(const std::string& name, const std::string& value);

[vabr (Chromium), 2016/04/28 14:42:13]

nit: Please add blank lines between method declarations.

[cfroussios, 2016/04/28 16:26:57]

Done.

+  void Append(const std::string& name, int64_t value);
+  // GHashTable, its keys and values returned from Get() are destroyed in
+  // |LibsecretAttributesBuilder| desctructor.
+  GHashTable* Get() { return attrs_; }
+
+ private:
+  // |name_values_| is a storage for strings referenced in |attrs_|.
+  std::list<std::string> name_values_;
+  GHashTable* attrs_;
+};

[vabr (Chromium), 2016/04/28 14:42:13]

Add DISALLOW_COPY_AND_ASSIGN

[cfroussios, 2016/04/28 16:26:57]

Done.

+
+#endif  // COMPONENTS_OS_CRYPT_LIBSECRET_LOADER_H_