Split the NullInitialized signal out of TrustedInitialized.

chrome/browser/prefs/tracked/pref_hash_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 236 matching lines @@
     const char kNumTrackedPrefFilename[] = "NumTrackedPrefs";
 
     base::FilePath num_tracked_prefs_file;
     ASSERT_TRUE(
         PathService::Get(chrome::DIR_USER_DATA, &num_tracked_prefs_file));
     num_tracked_prefs_file =
         num_tracked_prefs_file.AppendASCII(kNumTrackedPrefFilename);
 
     if (IsPRETest()) {
       num_tracked_prefs_ = GetTrackedPrefHistogramCount(
-          "Settings.TrackedPreferenceTrustedInitialized", ALLOW_ANY);
+          "Settings.TrackedPreferenceNullInitialized", ALLOW_ANY);
       EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM,
                 num_tracked_prefs_ > 0);
 
-      // Split tracked prefs are reported as Unchanged not as TrustedInitialized
+      // Split tracked prefs are reported as Unchanged not as NullInitialized
       // when an empty dictionary is encountered on first run (this should only
       // hit for pref #5 in the current design).
       int num_split_tracked_prefs = GetTrackedPrefHistogramCount(
           "Settings.TrackedPreferenceUnchanged", BEGIN_ALLOW_SINGLE_BUCKET + 5);
       EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM ? 1 : 0,
                 num_split_tracked_prefs);
 
       num_tracked_prefs_ += num_split_tracked_prefs;
 
       std::string num_tracked_prefs_str = base::IntToString(num_tracked_prefs_);
@@ skipping 119 matching lines @@
                                            ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceCleared",
                                            ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceTrustedInitialized", ALLOW_NONE));
+    EXPECT_EQ(0,
+              GetTrackedPrefHistogramCount(
+                  "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUnchangedDefault, UnchangedDefault);
 
 // Augments PrefHashBrowserTestUnchangedDefault to confirm that nothing is reset
@@ skipping 63 matching lines @@
     // Nothing else should have triggered.
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceChanged",
                                            ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceTrustedInitialized", ALLOW_NONE));
+    EXPECT_EQ(0,
+              GetTrackedPrefHistogramCount(
+                  "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestClearedAtomic, ClearedAtomic);
 
 // Verifies that clearing the MACs results in untrusted Initialized pings for
@@ skipping 26 matching lines @@
 
   virtual void AttackPreferencesOnDisk(
       base::DictionaryValue* unprotected_preferences,
       base::DictionaryValue* protected_preferences) OVERRIDE {
     EXPECT_TRUE(unprotected_preferences->Remove("protection.macs", NULL));
     if (protected_preferences)
       EXPECT_TRUE(protected_preferences->Remove("protection.macs", NULL));
   }
 
   virtual void VerifyReactionToPrefAttack() OVERRIDE {
-    // Preferences that are NULL by default will be TrustedInitialized.
+    // Preferences that are NULL by default will be NullInitialized.
     int num_null_values = GetTrackedPrefHistogramCount(
-        "Settings.TrackedPreferenceTrustedInitialized", ALLOW_ANY);
+        "Settings.TrackedPreferenceNullInitialized", ALLOW_ANY);
     EXPECT_EQ(protection_level_ > PROTECTION_DISABLED_ON_PLATFORM,
               num_null_values > 0);
     if (num_null_values > 0) {
       // This test requires that at least 3 prefs be non-null (extensions, DSE,
       // and 1 atomic pref explictly set for this test above).
-      EXPECT_LT(num_null_values, num_tracked_prefs() - 3);
+      EXPECT_GE(num_tracked_prefs() - num_null_values, 3);
     }
 
     // Expect all non-null prefs to be reported as Initialized (with
     // accompanying resets or wanted resets based on the current protection
     // level).
     EXPECT_EQ(num_tracked_prefs() - num_null_values,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_ANY));
 
     int num_protected_prefs = 0;
@@ skipping 125 matching lines @@
     // Nothing else should have triggered.
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceCleared",
                                            ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceTrustedInitialized", ALLOW_NONE));
+    EXPECT_EQ(0,
+              GetTrackedPrefHistogramCount(
+                  "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedAtomic, ChangedAtomic);
 
 // Verifies that changing or adding an entry in a split pref results in both
@@ skipping 67 matching lines @@
     // Nothing else should have triggered.
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceCleared",
                                            ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceTrustedInitialized", ALLOW_NONE));
+    EXPECT_EQ(0,
+              GetTrackedPrefHistogramCount(
+                  "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestChangedSplitPref, ChangedSplitPref);
 
 // Verifies that adding a value to unprotected preferences for a key which is
@@ skipping 43 matching lines @@
     // Nothing else should have triggered.
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceCleared",
                                            ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceTrustedInitialized", ALLOW_NONE));
+    EXPECT_EQ(0,
+              GetTrackedPrefHistogramCount(
+                  "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefs,
                        UntrustedAdditionToPrefs);
 
@@ skipping 47 matching lines @@
               GetTrackedPrefHistogramCount("Settings.TrackedPreferenceReset",
                                            ALLOW_NONE));
 
     // Nothing else should have triggered.
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceInitialized", ALLOW_NONE));
     EXPECT_EQ(0,
               GetTrackedPrefHistogramCount(
                   "Settings.TrackedPreferenceTrustedInitialized", ALLOW_NONE));
+    EXPECT_EQ(0,
+              GetTrackedPrefHistogramCount(
+                  "Settings.TrackedPreferenceNullInitialized", ALLOW_NONE));
     EXPECT_EQ(
         0,
         GetTrackedPrefHistogramCount(
             "Settings.TrackedPreferenceMigratedLegacyDeviceId", ALLOW_NONE));
   }
 };
 
 PREF_HASH_BROWSER_TEST(PrefHashBrowserTestUntrustedAdditionToPrefsAfterWipe,
                        UntrustedAdditionToPrefsAfterWipe);