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

chrome/browser/importer/external_process_importer_host.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 "chrome/browser/importer/external_process_importer_host.h"
 
 #include "base/bind.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/importer/external_process_importer_client.h"
@@ skipping 27 matching lines @@
   cancelled_ = true;
   // There is only a |client_| if the import was started.
   if (client_)
     client_->Cancel();
   NotifyImportEnded();  // Tells the observer that we're done, and deletes us.
 }
 
 void ExternalProcessImporterHost::StartImportSettings(
     const importer::SourceProfile& source_profile,
     Profile* target_profile,
-    uint16 items,
+    uint16_t items,
     ProfileWriter* writer) {
   // We really only support importing from one host at a time.
   DCHECK(!profile_);
   DCHECK(target_profile);
 
   profile_ = target_profile;
   writer_ = writer;
   source_profile_ = source_profile;
   items_ = items;
 
@@ skipping 119 matching lines @@
   // show a warning dialog, unless running without UI (in which case the import
   // must be aborted).
   is_source_readable_ = false;
   if (headless_)
     return false;
 
   ShowWarningDialog();
   return true;
 }
 
-void ExternalProcessImporterHost::CheckForLoadedModels(uint16 items) {
+void ExternalProcessImporterHost::CheckForLoadedModels(uint16_t items) {
   // A target profile must be loaded by StartImportSettings().
   DCHECK(profile_);
 
   // BookmarkModel should be loaded before adding IE favorites. So we observe
   // the BookmarkModel if needed, and start the task after it has been loaded.
   if ((items & importer::FAVORITES) && !writer_->BookmarkModelIsLoaded()) {
     BookmarkModelFactory::GetForProfile(profile_)->AddObserver(this);
     waiting_for_bookmarkbar_model_ = true;
     installed_bookmark_observer_ = true;
   }
 
   // Observes the TemplateURLService if needed to import search engines from the
   // other browser. We also check to see if we're importing bookmarks because
   // we can import bookmark keywords from Firefox as search engines.
   if ((items & importer::SEARCH_ENGINES) || (items & importer::FAVORITES)) {
     if (!writer_->TemplateURLServiceIsLoaded()) {
       TemplateURLService* model =
           TemplateURLServiceFactory::GetForProfile(profile_);
       template_service_subscription_ = model->RegisterOnLoadedCallback(
           base::Bind(&ExternalProcessImporterHost::OnTemplateURLServiceLoaded,
                      weak_ptr_factory_.GetWeakPtr()));
       model->Load();
     }
   }
 }