Fix metrics-reporting-enabled date expectations post metrics IDs reset.

components/metrics/metrics_state_manager_unittest.cc

 // Copyright 2014 The Chromium 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 "components/metrics/metrics_state_manager.h"
 
 #include <ctype.h>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 202 matching lines @@
     EXPECT_FALSE(prefs_.GetBoolean(prefs::kMetricsResetIds));
   }
 
   EXPECT_NE(kInitialClientId, prefs_.GetString(prefs::kMetricsClientID));
 }
 
 TEST_F(MetricsStateManagerTest, ForceClientIdCreation) {
   const int64 kFakeInstallationDate = 12345;
   prefs_.SetInt64(prefs::kInstallDate, kFakeInstallationDate);
 
+  const int64 test_begin_time = base::Time::Now().ToTimeT();
+
   // Holds ClientInfo from previous scoped test for extra checks.
   scoped_ptr<ClientInfo> previous_client_info;
 
   {
     scoped_ptr<MetricsStateManager> state_manager(CreateStateManager());
 
     // client_id shouldn't be auto-generated if metrics reporting is not
     // enabled.
     EXPECT_EQ(std::string(), state_manager->client_id());
     EXPECT_EQ(0, prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp));
 
     // Confirm that the initial ForceClientIdCreation call creates the client id
     // and backs it up via MockStoreClientInfoBackup.
     EXPECT_FALSE(stored_client_info_backup_);
     state_manager->ForceClientIdCreation();
     EXPECT_NE(std::string(), state_manager->client_id());
-    EXPECT_GT(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp), 0);
+    EXPECT_GE(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp),
+              test_begin_time);
 
     ASSERT_TRUE(stored_client_info_backup_);
     EXPECT_EQ(state_manager->client_id(),
               stored_client_info_backup_->client_id);
     EXPECT_EQ(kFakeInstallationDate,
               stored_client_info_backup_->installation_date);
     EXPECT_EQ(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp),
               stored_client_info_backup_->reporting_enabled_date);
 
     previous_client_info = stored_client_info_backup_.Pass();
@@ skipping 84 matching lines @@
   prefs_.ClearPref(prefs::kMetricsReportingEnabledTimestamp);
 
   {
     // When running the backup from old-style client ids, dashes should be
     // re-added. And missing dates in backup should be replaced by Time::Now().
 
     EXPECT_FALSE(stored_client_info_backup_);
 
     scoped_ptr<MetricsStateManager> state_manager(CreateStateManager());
     EXPECT_EQ(kBackupClientId, state_manager->client_id());
-    EXPECT_GT(prefs_.GetInt64(prefs::kInstallDate), 0);
-    EXPECT_GT(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp), 0);
+    EXPECT_GE(prefs_.GetInt64(prefs::kInstallDate), test_begin_time);
+    EXPECT_GE(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp),
+              test_begin_time);
 
     EXPECT_TRUE(stored_client_info_backup_);
     previous_client_info = stored_client_info_backup_.Pass();
   }
 
   prefs_.SetBoolean(prefs::kMetricsResetIds, true);
 
   {
     // Upon request to reset metrics ids, the existing backup should not be
     // restored.
 
     EXPECT_FALSE(stored_client_info_backup_);
 
     scoped_ptr<MetricsStateManager> state_manager(CreateStateManager());
 
     // A brand new client id should have been generated.
     EXPECT_NE(std::string(), state_manager->client_id());
     EXPECT_NE(previous_client_info->client_id, state_manager->client_id());
 
-    // Dates should not have been affected.
+    // The installation date should not have been affected.
     EXPECT_EQ(previous_client_info->installation_date,
               prefs_.GetInt64(prefs::kInstallDate));
-    EXPECT_EQ(previous_client_info->reporting_enabled_date,
-              prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp));
+
+    // The metrics-reporting-enabled date will be reset to Now().
+    EXPECT_GE(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp),
+              previous_client_info->reporting_enabled_date);
 
     stored_client_info_backup_.reset();
   }
 }
 
 }  // namespace metrics