Switch to standard integer types in rlz/.

rlz/win/lib/machine_id_win.cc

 // Copyright (c) 2012 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 <windows.h>
 #include <Sddl.h>  // For ConvertSidToStringSidW.
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "rlz/lib/assert.h"
 
 namespace rlz_lib {
 
 namespace {
 
 bool GetSystemVolumeSerialNumber(int* number) {
   if (!number)
@@ skipping 78 matching lines @@
   *volume_id = 0;
   if (!GetSystemVolumeSerialNumber(volume_id)) {
     ASSERT_STRING("GetMachineId: Failed to retrieve volume serial number");
     *volume_id = 0;
   }
 
   return true;
 }
 
 }  // namespace rlz_lib