shill: Remove uses of Base64Encode/Decode
Change to B64Encode/Decode to avoid memory leaks.
TEST=Unit tests pass
BUG=chromium:222827
Change-Id: I160fd8eae6d0d6d6307b1ab37b5d1029c3990abf
Reviewed-on: https://gerrit.chromium.org/gerrit/46172
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
diff --git a/glib.h b/glib.h
index 6e8e2cd..deb3496 100644
--- a/glib.h
+++ b/glib.h
@@ -10,21 +10,19 @@
#include <gio/gio.h>
#include <glib.h>
+#include <base/basictypes.h>
+
namespace shill {
// A GLib abstraction allowing GLib mocking in tests.
class GLib {
public:
+ GLib();
virtual ~GLib();
// Converts GLib's |error| to a string message and frees the GError object.
virtual std::string ConvertErrorToMessage(GError *error);
- // g_base64_decode
- virtual guchar *Base64Decode(const gchar *text, gsize *out_len);
- // g_base64_encode
- virtual gchar *Base64Encode(const guchar *data, gsize len);
-
// Thin wrappers around Base64Decode/Encode. Return true on success.
virtual bool B64Decode(const std::string &input, std::string *output);
virtual bool B64Encode(const std::string &input, std::string *output);
@@ -154,6 +152,9 @@
virtual void Strfreev(gchar **str_array);
// g_type_init
virtual void TypeInit();
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(GLib);
};
} // namespace shill