Switch to standard integer types in chrome/.

chrome/test/chromedriver/test_util.h

 // Copyright (c) 2013 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_TEST_CHROMEDRIVER_TEST_UTIL_H_
 #define CHROME_TEST_CHROMEDRIVER_TEST_UTIL_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_MACOSX)
 #include <Carbon/Carbon.h>
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
 // Restores the keyboard layout that was active at this object's creation
 // when this object goes out of scope.
@@ skipping 21 matching lines @@
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 // Selects the input source for the given input source ID. Returns true on
 // success.
 // Example: "com.apple.keyboardlayout.US" is the default en-us keyboard layout.
 bool SwitchKeyboardLayout(const std::string& input_source_id);
 #endif  // defined(OS_MACOSX)
 
 #endif  // CHROME_TEST_CHROMEDRIVER_TEST_UTIL_H_