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

metrics_daemon.cc

 // 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.
 
 #include "metrics_daemon.h"
 
 #include <dbus/dbus-glib-lowlevel.h>
 #include <sys/file.h>
 
 #include <base/eintr_wrapper.h>
 #include <base/logging.h>
 
 using base::Time;
 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"
 
 // File to aggregate daily usage before sending to UMA.
 // TODO(petkov): This file should probably live in a user-specific stateful
 // location, e.g., /home/chronos/user.
 static const char kDailyUseRecordFile[] = "/var/log/metrics/daily-usage";
 
 static const int kSecondsPerMinute = 60;
@@ skipping 20 matching lines @@
 const char MetricsDaemon::kMetricTimeToNetworkDropName[] =
     "Network.TimeToDrop";
 const int MetricsDaemon::kMetricTimeToNetworkDropMin = 1;
 const int MetricsDaemon::kMetricTimeToNetworkDropMax =
     8 /* hours */ * kMinutesPerHour * kSecondsPerMinute;
 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'",
 
   "type='signal',"
   "interface='" DBUS_IFACE_POWER_MANAGER "',"
   "path='/',"
   "member='PowerStateChanged'",
 
   "type='signal',"
   "interface='" DBUS_IFACE_SCREENSAVER_MANAGER "',"
@@ skipping 95 matching lines @@
   }
 
   // Signal messages always have interfaces.
   const char* interface = dbus_message_get_interface(message);
   CHECK(interface != NULL);
 
   MetricsDaemon* daemon = static_cast<MetricsDaemon*>(user_data);
 
   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);
 
     char *state_name;
     dbus_message_iter_get_basic(&iter, &state_name);
     daemon->NetStateChanged(state_name, ticks);
   } else if (strcmp(interface, DBUS_IFACE_POWER_MANAGER) == 0) {
     CHECK(strcmp(dbus_message_get_member(message),
                  "PowerStateChanged") == 0);
 
@@ skipping 267 matching lines @@
   usemon_source_ = NULL;
   usemon_interval_ = 0;
 }
 
 void MetricsDaemon::SendMetric(const std::string& name, int sample,
                                int min, int max, int nbuckets) {
   DLOG(INFO) << "received metric: " << name << " " << sample << " "
              << min << " " << max << " " << nbuckets;
   metrics_lib_->SendToUMA(name, sample, min, max, nbuckets);
 }