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

components/html_viewer/touch_handler.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_HTML_VIEWER_TOUCH_HANDLER_H_
 #define COMPONENTS_HTML_VIEWER_TOUCH_HANDLER_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "ui/events/gesture_detection/filtered_gesture_provider.h"
 
 namespace blink {
 class WebWidget;
 }
 
 namespace ui {
 class MotionEventGeneric;
 }
@@ skipping 32 matching lines @@
   // As touch events are received they are converted to this event. If null no
   // touch events are in progress.
   scoped_ptr<ui::MotionEventGeneric> current_motion_event_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHandler);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_TOUCH_HANDLER_H_