Switch to standard integer types in chrome/.

chrome/utility/importer/edge_importer_win.cc

 // Copyright 2015 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/utility/importer/edge_importer_win.h"
 
 #include <Shlobj.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 136 matching lines @@
       }
     }
   }
 }
 
 }  // namespace
 
 EdgeImporter::EdgeImporter() {}
 
 void EdgeImporter::StartImport(const importer::SourceProfile& source_profile,
-                               uint16 items,
+                               uint16_t items,
                                ImporterBridge* bridge) {
   bridge_ = bridge;
   bridge_->NotifyStarted();
   source_path_ = source_profile.source_path;
 
   if ((items & importer::FAVORITES) && !cancelled()) {
     bridge_->NotifyItemStarted(importer::FAVORITES);
     ImportFavorites();
     bridge_->NotifyItemEnded(importer::FAVORITES);
   }
@@ skipping 111 matching lines @@
   // With tree built sort the children of each node including the root.
   std::sort(root_entry.children.begin(), root_entry.children.end(),
             EdgeFavoriteEntryComparator());
   for (auto& entry : database_entries) {
     std::sort(entry.second.children.begin(), entry.second.children.end(),
               EdgeFavoriteEntryComparator());
   }
   std::vector<base::string16> path;
   BuildBookmarkEntries(root_entry, false, bookmarks, favicons, &path);
 }