Don't send machine and user ID to Omaha anymore. Send a/r pings instead.

prefs_unittest.cc

Index: prefs_unittest.cc
diff --git a/prefs_unittest.cc b/prefs_unittest.cc
index fc492fb048c53415f546ca141ff4d70eaaf72603..87116e5481c8a0ef446f900ff8ff6b99b44044ba 100644
--- a/prefs_unittest.cc
+++ b/prefs_unittest.cc
@@ -91,12 +91,11 @@ TEST_F(PrefsTest, SetStringBadKey) {
 TEST_F(PrefsTest, SetStringCreateDir) {
   const char kKey[] = "a-test-key";
   const char kValue[] = "test value";
-  EXPECT_TRUE(prefs_.Init(FilePath(prefs_dir_.Append("subdir"))));
+  FilePath subdir = prefs_dir_.Append("subdir1").Append("subdir2");
+  EXPECT_TRUE(prefs_.Init(subdir));
   EXPECT_TRUE(prefs_.SetString(kKey, kValue));
   string value;
-  EXPECT_TRUE(
-      file_util::ReadFileToString(prefs_dir_.Append("subdir").Append(kKey),
-                                  &value));
+  EXPECT_TRUE(file_util::ReadFileToString(subdir.Append(kKey), &value));
   EXPECT_EQ(kValue, value);
 }