Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/importer/ie_importer_browsertest_win.cc

 // Copyright (c) 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.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <propvarutil.h>
 #include <shlguid.h>
 #include <shlobj.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <urlhist.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_propvariant.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
@@ skipping 87 matching lines @@
 
 bool CreateOrderBlob(const base::FilePath& favorites_folder,
                      const base::string16& path,
                      const std::vector<base::string16>& entries) {
   if (entries.size() > 255)
     return false;
 
   // Create a binary sequence for setting a specific order of favorites.
   // The format depends on the version of Shell32.dll, so we cannot embed
   // a binary constant here.
-  std::vector<uint8> blob(20, 0);
-  blob[16] = static_cast<uint8>(entries.size());
+  std::vector<uint8_t> blob(20, 0);
+  blob[16] = static_cast<uint8_t>(entries.size());
 
   for (size_t i = 0; i < entries.size(); ++i) {
     PIDLIST_ABSOLUTE id_list_full = ILCreateFromPath(
         favorites_folder.Append(path).Append(entries[i]).value().c_str());
     PUITEMID_CHILD id_list = ILFindLastID(id_list_full);
     // Include the trailing zero-length item id.  Don't include the single
     // element array.
     size_t id_list_size = id_list->mkid.cb + sizeof(id_list->mkid.cb);
 
     blob.resize(blob.size() + 8);
-    uint32 total_size = id_list_size + 8;
+    uint32_t total_size = id_list_size + 8;
     memcpy(&blob[blob.size() - 8], &total_size, 4);
-    uint32 sort_index = i;
+    uint32_t sort_index = i;
     memcpy(&blob[blob.size() - 4], &sort_index, 4);
     blob.resize(blob.size() + id_list_size);
     memcpy(&blob[blob.size() - id_list_size], id_list, id_list_size);
     ILFree(id_list_full);
   }
 
   base::string16 key_path(importer::GetIEFavoritesOrderKey());
   if (!path.empty())
     key_path += L"\\" + path;
   base::win::RegKey key;
@@ skipping 63 matching lines @@
 }
 
 class TestObserver : public ProfileWriter,
                      public importer::ImporterProgressObserver {
  public:
   enum TestIEVersion {
     IE6,
     IE7,
   };
 
-  explicit TestObserver(uint16 importer_items, TestIEVersion ie_version)
+  explicit TestObserver(uint16_t importer_items, TestIEVersion ie_version)
       : ProfileWriter(NULL),
         bookmark_count_(0),
         history_count_(0),
         password_count_(0),
         favicon_count_(0),
         homepage_count_(0),
         ie7_password_count_(0),
         importer_items_(importer_items),
-        ie_version_(ie_version) {
-  }
+        ie_version_(ie_version) {}
 
   // importer::ImporterProgressObserver:
   void ImportStarted() override {}
   void ImportItemStarted(importer::ImportItem item) override {}
   void ImportItemEnded(importer::ImportItem item) override {}
   void ImportEnded() override {
     base::MessageLoop::current()->QuitWhenIdle();
     if (importer_items_ & importer::FAVORITES) {
       EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_);
       EXPECT_EQ(arraysize(kIEFaviconGroup), favicon_count_);
@@ skipping 117 matching lines @@
 
  private:
   ~TestObserver() override {}
 
   size_t bookmark_count_;
   size_t history_count_;
   size_t password_count_;
   size_t favicon_count_;
   size_t homepage_count_;
   size_t ie7_password_count_;
-  uint16 importer_items_;
+  uint16_t importer_items_;
   TestIEVersion ie_version_;
 };
 
 class MalformedFavoritesRegistryTestObserver
     : public ProfileWriter,
       public importer::ImporterProgressObserver {
  public:
   MalformedFavoritesRegistryTestObserver() : ProfileWriter(NULL) {
     bookmark_count_ = 0;
   }
@@ skipping 261 matching lines @@
   source_profile.source_path = temp_dir_.path();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HOME_PAGE,
       observer);
   base::MessageLoop::current()->Run();
 }