Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
index 495c589815842e5ee33cd4866dc3b58f9341242a..c1f23dabfd1fcc0198e7cc5fe266cf334edc480b 100644 |
--- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
+++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
@@ -4,8 +4,11 @@ |
#include "content/browser/frame_host/render_widget_host_view_child_frame.h" |
-#include "base/basictypes.h" |
+#include <stdint.h> |
+ |
+#include "base/macros.h" |
#include "base/message_loop/message_loop.h" |
+#include "build/build_config.h" |
#include "cc/surfaces/surface.h" |
#include "cc/surfaces/surface_factory.h" |
#include "cc/surfaces/surface_manager.h" |
@@ -44,7 +47,7 @@ class MockCrossProcessFrameConnector : public CrossProcessFrameConnector { |
~MockCrossProcessFrameConnector() override {} |
void ChildFrameCompositorFrameSwapped( |
- uint32 output_surface_id, |
+ uint32_t output_surface_id, |
int host_id, |
int route_id, |
scoped_ptr<cc::CompositorFrame> frame) override { |
@@ -88,7 +91,7 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
MockRenderProcessHost* process_host = |
new MockRenderProcessHost(browser_context_.get()); |
- int32 routing_id = process_host->GetNextRoutingID(); |
+ int32_t routing_id = process_host->GetNextRoutingID(); |
widget_host_ = |
new RenderWidgetHostImpl(&delegate_, process_host, routing_id, false); |
view_ = new RenderWidgetHostViewChildFrame(widget_host_); |