Switch to standard integer types in chrome/.

chrome/common/media_galleries/picasa_test_util.cc

 // Copyright 2013 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 "chrome/common/media_galleries/picasa_test_util.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "chrome/common/media_galleries/picasa_types.h"
 #include "chrome/common/media_galleries/pmp_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace picasa {
 
 void WriteAlbumTable(const base::FilePath& column_file_destination,
-                     const std::vector<uint32>& category_vector,
+                     const std::vector<uint32_t>& category_vector,
                      const std::vector<double>& date_vector,
                      const std::vector<std::string>& filename_vector,
                      const std::vector<std::string>& name_vector,
                      const std::vector<std::string>& token_vector,
                      const std::vector<std::string>& uid_vector) {
   ASSERT_TRUE(PmpTestUtil::WriteIndicatorFile(
       column_file_destination, kPicasaAlbumTableName));
   ASSERT_TRUE(PmpTestUtil::WriteColumnFileFromVector(
       column_file_destination, kPicasaAlbumTableName, "category",
       PMP_TYPE_UINT32, category_vector));
@@ skipping 11 matching lines @@
       PMP_TYPE_STRING, token_vector));
   ASSERT_TRUE(PmpTestUtil::WriteColumnFileFromVector(
       column_file_destination, kPicasaAlbumTableName, "uid",
       PMP_TYPE_STRING, uid_vector));
 }
 
 void WriteTestAlbumTable(
     const base::FilePath& column_file_destination,
     const base::FilePath& test_folder_1_path,
     const base::FilePath& test_folder_2_path) {
-  std::vector<uint32> category_vector;
+  std::vector<uint32_t> category_vector;
   category_vector.push_back(kAlbumCategoryFolder);
   category_vector.push_back(kAlbumCategoryInvalid);
   category_vector.push_back(kAlbumCategoryAlbum);
   category_vector.push_back(kAlbumCategoryFolder);
   category_vector.push_back(kAlbumCategoryAlbum);
 
   std::vector<double> date_vector;
   date_vector.push_back(0.0);
   date_vector.push_back(0.0);
   date_vector.push_back(0.0);
@@ skipping 47 matching lines @@
   const char folder_2_test_ini[] =
       "[InFirstAlbumOnly.jpg]\n"
       "albums=uid3\n";
   ASSERT_TRUE(
       base::WriteFile(test_folder_2_path.AppendASCII(kPicasaINIFilename),
                       folder_2_test_ini,
                       arraysize(folder_2_test_ini)));
 }
 
 }  // namespace picasa