Switch to standard integer types in components/, part 1 of 4.

components/exo/wayland/server.h

 // Copyright 2015 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_EXO_WAYLAND_SERVER_H_
 #define COMPONENTS_EXO_WAYLAND_SERVER_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "components/exo/wayland/scoped_wl.h"
 
 namespace exo {
 class Display;
 
 namespace wayland {
 
 // This class is a thin wrapper around a Wayland display server. All Wayland
@@ skipping 27 matching lines @@
   Display* const display_;
   scoped_ptr<wl_display, WlDisplayDeleter> wl_display_;
 
   DISALLOW_COPY_AND_ASSIGN(Server);
 };
 
 }  // namespace wayland
 }  // namespace exo
 
 #endif  // COMPONENTS_EXO_WAYLAND_SERVER_H_