Switch to standard integer types in base/strings/.

components/os_crypt/os_crypt.h

 // Copyright 2014 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 COMPONENTS_OS_CRYPT_OS_CRYPT_H_
 #define COMPONENTS_OS_CRYPT_OS_CRYPT_H_
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/strings/string16.h"
 
 // The OSCrypt class gives access to simple encryption and decryption of
 // strings. Note that on Mac, access to the system Keychain is required and
 // these calls can block the current thread to collect user input.
 class OSCrypt {
  public:
   // Encrypt a string16. The output (second argument) is really an array of
   // bytes, but we're passing it back as a std::string.
   static bool EncryptString16(const base::string16& plaintext,
@@ skipping 19 matching lines @@
   // For unit testing purposes we instruct the Encryptor to use a mock Keychain
   // on the Mac. The default is to use the real Keychain.
   static void UseMockKeychain(bool use_mock);
 #endif
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt);
 };
 
 #endif  // COMPONENTS_OS_CRYPT_OS_CRYPT_H_