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

chrome/browser/password_manager/native_backend_gnome_x.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_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
 
 // libgnome-keyring has been deprecated in favor of libsecret.
 // See: https://mail.gnome.org/archives/commits-list/2013-October/msg08876.html
 //
 // The define below turns off the deprecations, in order to avoid build
 // failures with Gnome 3.12. When we move to libsecret, the define can be
 // removed, together with the include below it.
 //
 // The porting is tracked in http://crbug.com/355223
 #define GNOME_KEYRING_DEPRECATED
 #define GNOME_KEYRING_DEPRECATED_FOR(x)
 #include <gnome-keyring.h>
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/password_manager/password_store_x.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace autofill {
 struct PasswordForm;
 }
 
@@ skipping 117 matching lines @@
   // The local profile id, used to generate the app string.
   const LocalProfileId profile_id_;
 
   // The app string, possibly based on the local profile id.
   std::string app_string_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeBackendGnome);
 };
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_