commit e334840fb37dd8067b785408eb03dffe485edb47
author Darin Petkov <petkov@chromium.org> Fri Jun 04 14:07:41 2010 -0700
committer Darin Petkov <petkov@chromium.org> Fri Jun 04 14:07:41 2010 -0700
tree 9bb6c01952d00a94991c0f40b819dab4f5a426cc
parent f27f036d3149e130376b59458d7eb6c1a10a9bb7

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

Review URL: http://codereview.chromium.org/2664003

metrics/metrics_daemon.cc

diff --git a/metrics/metrics_daemon.cc b/metrics/metrics_daemon.cc
index ecbea05..523d8bd 100644
--- a/metrics/metrics_daemon.cc
+++ b/metrics/metrics_daemon.cc
@@ -15,7 +15,7 @@
 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 @@
 // 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 @@
 
   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);
 

metrics/metrics_daemon_test.cc

diff --git a/metrics/metrics_daemon_test.cc b/metrics/metrics_daemon_test.cc
index 79be3dd..5614eed 100644
--- a/metrics/metrics_daemon_test.cc
+++ b/metrics/metrics_daemon_test.cc
@@ -312,7 +312,7 @@
   DeleteDBusMessage(msg);
 
   msg = NewDBusSignalString("/",
-                            "org.moblin.connman.Manager",
+                            "org.chromium.flimflam.Manager",
                             "StateChanged",
                             "online");
   EXPECT_EQ(MetricsDaemon::kUnknownNetworkState, daemon_.network_state_);