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

chrome/browser/importer/external_process_importer_host.h

 // 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_HOST_H_
 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_HOST_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/profile_writer.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/search_engines/template_url_service.h"
 #include "ui/gfx/native_widget_types.h"
 
@@ skipping 17 matching lines @@
 
   // Starts the process of importing the settings and data depending on what the
   // user selected.
   // |source_profile| - importer profile to import.
   // |target_profile| - profile to import into.
   // |items| - specifies which data to import (bitmask of importer::ImportItem).
   // |writer| - called to actually write data back to the profile.
   virtual void StartImportSettings(
       const importer::SourceProfile& source_profile,
       Profile* target_profile,
-      uint16 items,
+      uint16_t items,
       ProfileWriter* writer);
 
   // When in headless mode, the importer will not show any warning dialog if
   // a user action is required (e.g., Firefox profile is locked and user should
   // close Firefox to continue) and the outcome is as if the user had canceled
   // the import operation.
   void set_headless() { headless_ = true; }
   bool is_headless() const { return headless_; }
 
   void set_parent_window(gfx::NativeWindow parent_window) {
@@ skipping 44 matching lines @@
   // Make sure that Firefox isn't running, if import browser is Firefox. Show
   // to the user a dialog that notifies that is necessary to close Firefox
   // prior to continue.
   // |source_profile| - importer profile to import.
   // Returns false iff import should be aborted.
   bool CheckForFirefoxLock(const importer::SourceProfile& source_profile);
 
   // Make sure BookmarkModel and TemplateURLService are loaded before import
   // process starts, if bookmarks and/or search engines are among the items
   // which are to be imported.
-  void CheckForLoadedModels(uint16 items);
+  void CheckForLoadedModels(uint16_t items);
 
   // True if UI is not to be shown.
   bool headless_;
 
   // Parent window that we pass to the import lock dialog (i.e, the Firefox
   // warning dialog).
   gfx::NativeWindow parent_window_;
 
   // The observer that we need to notify about changes in the import process.
   importer::ImporterProgressObserver* observer_;
@@ skipping 20 matching lines @@
   // Writes data from the importer back to the profile.
   scoped_refptr<ProfileWriter> writer_;
 
   // Used to pass notifications from the browser side to the external process.
   ExternalProcessImporterClient* client_;
 
   // Information about a profile needed for importing.
   importer::SourceProfile source_profile_;
 
   // Bitmask of items to be imported (see importer::ImportItem enum).
-  uint16 items_;
+  uint16_t items_;
 
   // True if the import process has been cancelled.
   bool cancelled_;
 
   // Vends weak pointers for the importer to call us back.
   base::WeakPtrFactory<ExternalProcessImporterHost> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterHost);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_HOST_H_