Switch to standard integer types in mojo/.

mojo/message_pump/handle_watcher.h

 // Copyright 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 MOJO_MESSAGE_PUMP_HANDLE_WATCHER_H_
 #define MOJO_MESSAGE_PUMP_HANDLE_WATCHER_H_
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "mojo/message_pump/mojo_message_pump_export.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace base {
 class Thread;
 }
 
 namespace mojo {
@@ skipping 33 matching lines @@
   // If non-NULL Start() has been invoked.
   scoped_ptr<StateBase> state_;
 
   DISALLOW_COPY_AND_ASSIGN(HandleWatcher);
 };
 
 }  // namespace common
 }  // namespace mojo
 
 #endif  // MOJO_MESSAGE_PUMP_HANDLE_WATCHER_H_