Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_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 <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
-#include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
@@ skipping 55 matching lines @@
     return SkColorSetARGB(0, 0, 0, 0);
   }
   if (bitmap.isNull()) {
     ADD_FAILURE() << "Bitmap has no pixelref.";
     return SkColorSetARGB(0, 0, 0, 0);
   }
   if (bitmap.colorType() == kUnknown_SkColorType) {
     ADD_FAILURE() << "Bitmap has not been configured.";
     return SkColorSetARGB(0, 0, 0, 0);
   }
-  uint64 a = 0, r = 0, g = 0, b = 0;
+  uint64_t a = 0, r = 0, g = 0, b = 0;
   bitmap.lockPixels();
   for (int x = 0; x < bitmap.width(); ++x) {
     for (int y = 0; y < bitmap.height(); ++y) {
       const SkColor color = bitmap.getColor(x, y);
       a += SkColorGetA(color);
       r += SkColorGetR(color);
       g += SkColorGetG(color);
       b += SkColorGetB(color);
     }
   }
   bitmap.unlockPixels();
-  uint64 pixel_number = bitmap.width() * bitmap.height();
+  uint64_t pixel_number = bitmap.width() * bitmap.height();
   return SkColorSetARGB((a + pixel_number / 2) / pixel_number,
                         (r + pixel_number / 2) / pixel_number,
                         (g + pixel_number / 2) / pixel_number,
                         (b + pixel_number / 2) / pixel_number);
 }
 
 // Obtain background image and return its average ARGB color.
 SkColor GetAverageBackgroundColor() {
   const gfx::ImageSkia image =
       ash::Shell::GetInstance()->desktop_background_controller()->
@@ skipping 29 matching lines @@
       const AccountId& account_id) {
     scoped_ptr<policy::UserPolicyBuilder>
         user_policy_builder(new policy::UserPolicyBuilder());
     base::FilePath user_keys_dir;
     EXPECT_TRUE(PathService::Get(DIR_USER_POLICY_KEYS, &user_keys_dir));
     const std::string sanitized_user_id =
         CryptohomeClient::GetStubSanitizedUsername(account_id.GetUserEmail());
     const base::FilePath user_key_file =
         user_keys_dir.AppendASCII(sanitized_user_id)
                      .AppendASCII("policy.pub");
-    std::vector<uint8> user_key_bits;
+    std::vector<uint8_t> user_key_bits;
     EXPECT_TRUE(user_policy_builder->GetSigningKey()->
                 ExportPublicKey(&user_key_bits));
     EXPECT_TRUE(base::CreateDirectory(user_key_file.DirName()));
     EXPECT_EQ(base::WriteFile(
                   user_key_file,
                   reinterpret_cast<const char*>(user_key_bits.data()),
                   user_key_bits.size()),
               static_cast<int>(user_key_bits.size()));
     user_policy_builder->policy_data().set_username(account_id.GetUserEmail());
     return user_policy_builder.Pass();
@@ skipping 237 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) {
   LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
 }  // namespace chromeos