Revise system profile prefs clearing

components/metrics/metrics_log_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_log.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <string>
@@ skipping 289 matching lines @@
 
   {
     TestMetricsLog log(
         kClientId, kSessionId, MetricsLog::ONGOING_LOG, &client, &prefs_);
     std::string app_version;
     EXPECT_TRUE(log.LoadSavedEnvironmentFromPrefs(&app_version));
     EXPECT_EQ("bogus version", app_version);
     // Check some values in the system profile.
     EXPECT_EQ(kInstallDateExpected, log.system_profile().install_date());
     EXPECT_EQ(kEnabledDateExpected, log.system_profile().uma_enabled_date());
-    // Ensure that the call cleared the prefs.
-    EXPECT_TRUE(prefs_.GetString(kSystemProfilePref).empty());
-    EXPECT_TRUE(prefs_.GetString(kSystemProfileHashPref).empty());
+    // Ensure that the call did not clear the prefs.
+    EXPECT_FALSE(prefs_.GetString(kSystemProfilePref).empty());
+    EXPECT_FALSE(prefs_.GetString(kSystemProfileHashPref).empty());
   }
 
   // Ensure that a non-matching hash results in the pref being invalid.
   {
     TestMetricsLog log(
         kClientId, kSessionId, MetricsLog::ONGOING_LOG, &client, &prefs_);
     // Call RecordEnvironment() to record the pref again.
     log.RecordEnvironment(std::vector<MetricsProvider*>(),
                           std::vector<variations::ActiveGroupId>(),
                           kInstallDate, kEnabledDate);
   }
 
   {
     // Set the hash to a bad value.
     prefs_.SetString(kSystemProfileHashPref, "deadbeef");
     TestMetricsLog log(
         kClientId, kSessionId, MetricsLog::ONGOING_LOG, &client, &prefs_);
     std::string app_version;
     EXPECT_FALSE(log.LoadSavedEnvironmentFromPrefs(&app_version));
     EXPECT_TRUE(app_version.empty());
-    // Ensure that the prefs are cleared, even if the call failed.
-    EXPECT_TRUE(prefs_.GetString(kSystemProfilePref).empty());
-    EXPECT_TRUE(prefs_.GetString(kSystemProfileHashPref).empty());
+    // Ensure that the prefs are not cleared, even if the call failed.
+    EXPECT_FALSE(prefs_.GetString(kSystemProfilePref).empty());
+    EXPECT_FALSE(prefs_.GetString(kSystemProfileHashPref).empty());
   }
 }
 
 TEST_F(MetricsLogTest, RecordEnvironmentEnableDefault) {
   TestMetricsServiceClient client;
   TestMetricsLog log_unknown(kClientId, kSessionId, MetricsLog::ONGOING_LOG,
                              &client, &prefs_);
 
   std::vector<variations::ActiveGroupId> synthetic_trials;
 
@@ skipping 117 matching lines @@
   TestMetricsServiceClient client;
   client.set_product(kTestProduct);
   TestMetricsLog log(
       kClientId, kSessionId, MetricsLog::ONGOING_LOG, &client, &prefs_);
   // Check that the product is set to |kTestProduct|.
   EXPECT_TRUE(log.uma_proto().has_product());
   EXPECT_EQ(kTestProduct, log.uma_proto().product());
 }
 
 }  // namespace metrics