remove TimeToDrop support

metrics_daemon_test.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 <utime.h>
 
 #include <base/file_util.h>
 #include <gtest/gtest.h>
 
 #include "counter_mock.h"
@@ skipping 20 matching lines @@
 // This class allows a TimeTicks object to be initialized with seconds
 // (rather than microseconds) through the protected TimeTicks(int64)
 // constructor.
 class TestTicks : public TimeTicks {
  public:
   TestTicks(int64 seconds)
       : TimeTicks(seconds * Time::kMicrosecondsPerSecond) {}
 };
 
 // Overloaded for test failure printing purposes.
-static std::ostream& operator<<(std::ostream& o, const TimeTicks& ticks) {
-  o << ticks.ToInternalValue() << "us";
-  return o;
-};
-
-// Overloaded for test failure printing purposes.
 static std::ostream& operator<<(std::ostream& o, const Time& time) {
   o << time.ToInternalValue() << "us";
   return o;
 };
 
 class MetricsDaemonTest : public testing::Test {
  protected:
   virtual void SetUp() {
     EXPECT_EQ(NULL, daemon_.daily_use_.get());
     EXPECT_EQ(NULL, daemon_.kernel_crash_interval_.get());
@@ skipping 50 matching lines @@
     // Reset all frequency counter reporters to mocks for further testing.
     MetricsDaemon::FrequencyCounters::iterator i;
     for (i = daemon_.frequency_counters_.begin();
          i != daemon_.frequency_counters_.end(); ++i) {
       delete i->second;
       i->second = new StrictMock<FrequencyCounterMock>();
     }
 
     EXPECT_FALSE(daemon_.user_active_);
     EXPECT_TRUE(daemon_.user_active_last_.is_null());
-    EXPECT_EQ(MetricsDaemon::kUnknownNetworkState, daemon_.network_state_);
-    EXPECT_TRUE(daemon_.network_state_last_.is_null());
     EXPECT_EQ(MetricsDaemon::kUnknownPowerState, daemon_.power_state_);
     EXPECT_EQ(MetricsDaemon::kUnknownSessionState, daemon_.session_state_);
 
     file_util::Delete(FilePath(kTestDir), true);
     file_util::CreateDirectory(FilePath(kTestDir));
   }
 
   virtual void TearDown() {}
 
   const TaggedCounterReporter*
@@ skipping 54 matching lines @@
 
   // Adds a metrics library mock expectation that the specified daily
   // use time metric will be generated.
   void ExpectDailyUseTimeMetric(int sample) {
     ExpectMetric(MetricsDaemon::kMetricDailyUseTimeName, sample,
                  MetricsDaemon::kMetricDailyUseTimeMin,
                  MetricsDaemon::kMetricDailyUseTimeMax,
                  MetricsDaemon::kMetricDailyUseTimeBuckets);
   }
 
-  // Adds a metrics library mock expectation that the specified time
-  // to network dropping metric will be generated.
-  void ExpectTimeToNetworkDropMetric(int sample) {
-    ExpectMetric(MetricsDaemon::kMetricTimeToNetworkDropName, sample,
-                 MetricsDaemon::kMetricTimeToNetworkDropMin,
-                 MetricsDaemon::kMetricTimeToNetworkDropMax,
-                 MetricsDaemon::kMetricTimeToNetworkDropBuckets);
-  }
-
   // Converts from seconds to a Time object.
   Time TestTime(int64 seconds) {
     return Time::FromInternalValue(seconds * Time::kMicrosecondsPerSecond);
   }
 
   // Creates a new DBus signal message with a single string
   // argument. The message can be deallocated through
   // DeleteDBusMessage.
   //
   // |path| is the object emitting the signal.
@@ skipping 61 matching lines @@
   MetricsDaemon::ReportDailyUse(&daemon_, /* tag */ 20, /* count */ 90);
 
   ExpectDailyUseTimeMetric(/* sample */ 1);
   MetricsDaemon::ReportDailyUse(&daemon_, /* tag */ 23, /* count */ 89);
 
   // There should be no metrics generated for the calls below.
   MetricsDaemon::ReportDailyUse(&daemon_, /* tag */ 50, /* count */ 0);
   MetricsDaemon::ReportDailyUse(&daemon_, /* tag */ 60, /* count */ -5);
 }
 
-TEST_F(MetricsDaemonTest, LookupNetworkState) {
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOnline,
-            daemon_.LookupNetworkState("online"));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOffline,
-            daemon_.LookupNetworkState("offline"));
-  EXPECT_EQ(MetricsDaemon::kUnknownNetworkState,
-            daemon_.LookupNetworkState("somestate"));
-}
-
 TEST_F(MetricsDaemonTest, LookupPowerState) {
   EXPECT_EQ(MetricsDaemon::kPowerStateOn,
             daemon_.LookupPowerState("on"));
   EXPECT_EQ(MetricsDaemon::kPowerStateMem,
             daemon_.LookupPowerState("mem"));
   EXPECT_EQ(MetricsDaemon::kUnknownPowerState,
             daemon_.LookupPowerState("somestate"));
 }
 
 TEST_F(MetricsDaemonTest, LookupSessionState) {
@@ skipping 34 matching lines @@
       .RetiresOnSaturation();
   msg = NewDBusSignalString("/",
                             "org.chromium.CrashReporter",
                             "UserCrash",
                             "");
   res = MetricsDaemon::MessageFilter(/* connection */ NULL, msg, &daemon_);
   EXPECT_EQ(DBUS_HANDLER_RESULT_HANDLED, res);
   DeleteDBusMessage(msg);
 
   msg = NewDBusSignalString("/",
-                            "org.chromium.flimflam.Manager",
-                            "StateChanged",
-                            "online");
-  EXPECT_EQ(MetricsDaemon::kUnknownNetworkState, daemon_.network_state_);
-  res = MetricsDaemon::MessageFilter(/* connection */ NULL, msg, &daemon_);
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOnline, daemon_.network_state_);
-  EXPECT_EQ(DBUS_HANDLER_RESULT_HANDLED, res);
-  DeleteDBusMessage(msg);
-
-  msg = NewDBusSignalString("/",
                             "org.chromium.PowerManager",
                             "PowerStateChanged",
                             "on");
   EXPECT_EQ(MetricsDaemon::kUnknownPowerState, daemon_.power_state_);
   res = MetricsDaemon::MessageFilter(/* connection */ NULL, msg, &daemon_);
   EXPECT_EQ(MetricsDaemon::kPowerStateOn, daemon_.power_state_);
   EXPECT_EQ(DBUS_HANDLER_RESULT_HANDLED, res);
   DeleteDBusMessage(msg);
 
   IgnoreActiveUseUpdate();
@@ skipping 20 matching lines @@
 
   msg = NewDBusSignalString("/",
                             "org.chromium.UnknownService.Manager",
                             "StateChanged",
                             "randomstate");
   res = MetricsDaemon::MessageFilter(/* connection */ NULL, msg, &daemon_);
   EXPECT_EQ(DBUS_HANDLER_RESULT_NOT_YET_HANDLED, res);
   DeleteDBusMessage(msg);
 }
 
-TEST_F(MetricsDaemonTest, NetStateChangedSimpleDrop) {
-  daemon_.NetStateChanged("online", TestTicks(10));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOnline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(10), daemon_.network_state_last_);
-
-  ExpectTimeToNetworkDropMetric(20);
-  daemon_.NetStateChanged("offline", TestTicks(30));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOffline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(30), daemon_.network_state_last_);
-}
-
-TEST_F(MetricsDaemonTest, NetStateChangedSuspend) {
-  daemon_.NetStateChanged("offline", TestTicks(30));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOffline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(30), daemon_.network_state_last_);
-
-  daemon_.NetStateChanged("online", TestTicks(60));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOnline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(60), daemon_.network_state_last_);
-
-  daemon_.power_state_ = MetricsDaemon::kPowerStateMem;
-  daemon_.NetStateChanged("offline", TestTicks(85));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOffline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(85), daemon_.network_state_last_);
-
-  daemon_.NetStateChanged("somestate", TestTicks(90));
-  EXPECT_EQ(MetricsDaemon::kUnknownNetworkState, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(90), daemon_.network_state_last_);
-
-  daemon_.NetStateChanged("offline", TestTicks(95));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOffline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(95), daemon_.network_state_last_);
-
-  daemon_.power_state_ = MetricsDaemon::kPowerStateOn;
-  daemon_.NetStateChanged("online", TestTicks(105));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOnline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(105), daemon_.network_state_last_);
-
-  ExpectTimeToNetworkDropMetric(3);
-  daemon_.NetStateChanged("offline", TestTicks(108));
-  EXPECT_EQ(MetricsDaemon::kNetworkStateOffline, daemon_.network_state_);
-  EXPECT_EQ(TestTicks(108), daemon_.network_state_last_);
-}
-
 TEST_F(MetricsDaemonTest, PowerStateChanged) {
   ExpectActiveUseUpdate(7, 0);
   daemon_.SetUserActiveState(/* active */ true,
                              TestTime(7 * kSecondsPerDay + 15));
   EXPECT_TRUE(daemon_.user_active_);
   EXPECT_EQ(TestTime(7 * kSecondsPerDay + 15), daemon_.user_active_last_);
 
   ExpectActiveUseUpdate(7, 30);
   daemon_.PowerStateChanged("mem", TestTime(7 * kSecondsPerDay + 45));
   EXPECT_EQ(MetricsDaemon::kPowerStateMem, daemon_.power_state_);
@@ skipping 143 matching lines @@
 TEST_F(MetricsDaemonTest, GetHistogramPath) {
   EXPECT_EQ("/var/log/metrics/Logging.AnyCrashesDaily",
             daemon_.GetHistogramPath(
                 MetricsDaemon::kMetricAnyCrashesDailyName).value());
 }
 
 int main(int argc, char** argv) {
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }