AU: Use Omaha ID rather than MAC address in delta updater

src/platform/update_engine/delta_diff_generator_unittest.cc

 // Copyright (c) 2009 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 <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string>
 #include <vector>
@@ skipping 65 matching lines @@
   EXPECT_EQ(0, System(StringPrintf("rm -f '%s/dir/subdir/fifo'", base_c)));
   EXPECT_EQ(0, System(StringPrintf("mkfifo '%s/dir/subdir/fifo'", base_c)));
   EXPECT_EQ(0, System(StringPrintf("ln -f -s /target '%s/dir/subdir/link'",
                                    base_c)));
   EXPECT_EQ(0, System(StringPrintf("rm -f '%s/hard_link'", base_c)));
   EXPECT_EQ(0, System(StringPrintf("ln '%s/hi' '%s/hard_link'",
                                    base_c, base_c)));
   EXPECT_EQ(0, System(StringPrintf(
       "ln -f -s '%s' '%s/compress_link'", kWellCompressingFilename, base_c)));
 
-// Things that will encode differently:
-EXPECT_EQ(0, System(StringPrintf("mkdir -p '%s/encoding'", base_c)));
-EXPECT_EQ(0, System(StringPrintf("echo nochange > '%s/encoding/nochange'",
-                                 base_c)));
-EXPECT_EQ(0, System(StringPrintf("echo -n > '%s/encoding/onebyte'", base_c)));
-EXPECT_EQ(0, System(StringPrintf("echo -n > '%s/encoding/long_new'",
-                                 base_c)));
-// Random 1 MiB byte length file
-EXPECT_TRUE(WriteFile((base +
-                       "/encoding/long_small_change").c_str(),
-                      reinterpret_cast<const char*>(kRandomString),
-                      sizeof(kRandomString)));
+  // Things that will encode differently:
+  EXPECT_EQ(0, System(StringPrintf("mkdir -p '%s/encoding'", base_c)));
+  EXPECT_EQ(0, System(StringPrintf("echo nochange > '%s/encoding/nochange'",
+                                   base_c)));
+  EXPECT_EQ(0, System(StringPrintf("echo -n > '%s/encoding/onebyte'", base_c)));
+  EXPECT_EQ(0, System(StringPrintf("echo -n > '%s/encoding/long_new'",
+                                   base_c)));
+  // Random 1 MiB byte length file
+  EXPECT_TRUE(utils::WriteFile((base +
+                                "/encoding/long_small_change").c_str(),
+                               reinterpret_cast<const char*>(kRandomString),
+                               sizeof(kRandomString)));
 }
 // base points to a folder that was passed to GenerateFilesAtPath().
 // This edits some, so that one can make a diff from the original data
 // and the edited data.
 void EditFilesAtPath(const string& base) {
   CHECK_EQ(0, System(string("echo hello > ") + base + "/dir/hello"));
   CHECK_EQ(0, System(string("echo -n > ") + base + "/dir/newempty"));
   CHECK_EQ(0, System(string("echo newhi > ") + base + "/hi"));
   CHECK_EQ(0, System(string("echo -n h >> ") + base +
                      "/encoding/onebyte"));
@@ skipping 814 matching lines @@
   {
     vector<char> data(14);
     memcpy(&data[0], "CrAU\0\0\0\0\0\0\0\x0cxx", 12);
     WriteFileVector("diff-gen-test/baddelta", data);
     DeltaDiffParser parser("diff-gen-test/baddelta");
     EXPECT_FALSE(parser.valid());
   }
 }
 
 }  // namespace chromeos_update_engine