Add metrics library tests. Some metrics daemon API cleanup.

src/platform/metrics/Makefile

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Makefile for metrics utilities -- library, client and daemon
 #
 
 CCONFIG = $(shell $(PKG_CONFIG) --cflags dbus-1 glib-2.0 dbus-glib-1)
 LDCONFIG = $(shell $(PKG_CONFIG) --libs dbus-1 glib-2.0 gthread-2.0 dbus-glib-1)
 
 CXXFLAGS += -Wall -Werror -fPIC -fno-exceptions $(CCONFIG)
 
 CLIENT = metrics_client
 DAEMON = metrics_daemon
 DAEMON_TEST = metrics_daemon_test
 LIB = libmetrics.a
 SHAREDLIB = libmetrics.so
+LIB_TEST = metrics_library_test
 
 CLIENT_OBJS = \
         metrics_client.o
 LIB_OBJS = \
         metrics_library.o
+TESTLIB_OBJS = \
+        metrics_library.o \
+        metrics_library_test.o
 DAEMON_OBJS = \
         metrics_daemon.o \
         metrics_daemon_main.o
 TESTDAEMON_OBJS = \
         metrics_daemon.o \
         metrics_daemon_test.o
 
-DAEMON_LDFLAGS = $(LDCONFIG) -lrt -lbase -lpthread -lgflags
+DAEMON_LDFLAGS = $(LDFLAGS) $(LDCONFIG) -lrt -lbase -lpthread -lgflags
 TESTDAEMON_LIBS = -lgmock -lgtest
+TESTLIB_LIBS = -lgtest -lbase -lrt -lpthread
 
 all: $(LIB) $(SHAREDLIB) $(CLIENT) $(DAEMON)
 
-tests: $(DAEMON_TEST)
+tests: $(DAEMON_TEST) $(LIB_TEST)
 
 $(CLIENT): $(CLIENT_OBJS) $(SHAREDLIB)
         $(CXX) $(LDFLAGS) $^ -o $@
 
 $(DAEMON): $(DAEMON_OBJS) $(SHAREDLIB)
         $(CXX) -o $@ $^ $(DAEMON_LDFLAGS)
 
-$(DAEMON_TEST): $(TESTDAEMON_OBJS) $(SHAREDLIB)
+$(DAEMON_TEST): $(TESTDAEMON_OBJS)
         $(CXX) -o $@ $^ $(DAEMON_LDFLAGS) $(TESTDAEMON_LIBS)
 
 $(LIB): $(LIB_OBJS)
         $(AR) rcs $@ $^
 
 $(SHAREDLIB): $(LIB_OBJS)
         $(CXX) $(LDFLAGS) -shared $^ -o $@
 
+$(LIB_TEST): $(TESTLIB_OBJS) $(SHAREDLIB)
+        $(CXX) -o $@ $^ $(LDFLAGS) $(TESTLIB_LIBS)
+
 %.o: %.cc
         $(CXX) $(CXXFLAGS) -c $< -o $@
 
 # dependencies in addition to those defined by the rules
 
 metrics_daemon.o: \
         metrics_daemon.h \
         network_states.h \
         power_states.h
 metrics_daemon_test.o: \
         metrics_daemon.h \
         network_states.h \
         power_states.h
 
 clean:
-        rm -f $(CLIENT) $(DAEMON) $(LIB) $(SHAREDLIB) $(TESTDAEMON) *.o
+        rm -f $(CLIENT) $(DAEMON) $(LIB) $(SHAREDLIB) *.o
+        rm -f $(DAEMON_TEST) $(LIB_TEST)