openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s/org.moblin.connman/org.chromium.flimflam/ 

Review URL: http://codereview.chromium.org/2664003
This commit is contained in:
Darin Petkov 2010-06-04 14:07:41 -07:00
parent f27f036d31
commit e334840fb3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
metrics/metrics_daemon.cc
View File

@ -15,7 +15,7 @@ using base::TimeDelta;
using base::TimeTicks;
#define SAFE_MESSAGE(e) (e.message ? e.message : "unknown error")
#define DBUS_IFACE_CONNMAN_MANAGER "org.moblin.connman.Manager"
#define DBUS_IFACE_FLIMFLAM_MANAGER "org.chromium.flimflam.Manager"
#define DBUS_IFACE_POWER_MANAGER "org.chromium.Power.Manager"
#define DBUS_IFACE_SCREENSAVER_MANAGER "org.chromium.ScreenSaver.Manager"
#define DBUS_IFACE_SESSION_MANAGER "org.chromium.SessionManagerInterface"
@ -56,8 +56,8 @@ const int MetricsDaemon::kMetricTimeToNetworkDropBuckets = 50;
// static
const char* MetricsDaemon::kDBusMatches_[] = {
"type='signal',"
"sender='org.moblin.connman',"
"interface='" DBUS_IFACE_CONNMAN_MANAGER "',"
"sender='org.chromium.flimflam',"
"interface='" DBUS_IFACE_FLIMFLAM_MANAGER "',"
"path='/',"
"member='StateChanged'",
@ -173,7 +173,7 @@ DBusHandlerResult MetricsDaemon::MessageFilter(DBusConnection* connection,
DBusMessageIter iter;
dbus_message_iter_init(message, &iter);
if (strcmp(interface, DBUS_IFACE_CONNMAN_MANAGER) == 0) {
if (strcmp(interface, DBUS_IFACE_FLIMFLAM_MANAGER) == 0) {
CHECK(strcmp(dbus_message_get_member(message),
"StateChanged") == 0);

2
metrics/metrics_daemon_test.cc
View File

@ -312,7 +312,7 @@ TEST_F(MetricsDaemonTest, MessageFilter) {
DeleteDBusMessage(msg);
msg = NewDBusSignalString("/",
"org.moblin.connman.Manager",
"org.chromium.flimflam.Manager",
"StateChanged",
"online");
EXPECT_EQ(MetricsDaemon::kUnknownNetworkState, daemon_.network_state_);