Switch to standard integer types in content/browser/.

content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc

 // Copyright 2014 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.
 
 #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"
 #include "cc/surfaces/surface_sequence.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/frame_host/cross_process_frame_connector.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/view_messages.h"
@@ skipping 18 matching lines @@
 
 class MockCrossProcessFrameConnector : public CrossProcessFrameConnector {
  public:
   MockCrossProcessFrameConnector()
       : CrossProcessFrameConnector(nullptr),
         last_scale_factor_received_(0.f),
         received_delegated_frame_(false) {}
   ~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 {
     received_delegated_frame_ = true;
     last_frame_size_received_ =
         frame->delegated_frame_data->render_pass_list.back()
             ->output_rect.size();
     last_scale_factor_received_ = frame->metadata.device_scale_factor;
   }
 
@@ skipping 23 matching lines @@
     browser_context_.reset(new TestBrowserContext);
 
 // ImageTransportFactory doesn't exist on Android.
 #if !defined(OS_ANDROID)
     ImageTransportFactory::InitializeForUnitTests(
         make_scoped_ptr(new NoTransportImageTransportFactory));
 #endif
 
     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_);
 
     test_frame_connector_ = new MockCrossProcessFrameConnector();
     view_->set_cross_process_frame_connector(test_frame_connector_);
   }
 
   void TearDown() override {
     if (view_)
@@ skipping 82 matching lines @@
                 test_frame_connector_->last_scale_factor_received_);
     }
   } else {
     EXPECT_TRUE(test_frame_connector_->received_delegated_frame_);
     EXPECT_EQ(view_size, test_frame_connector_->last_frame_size_received_);
     EXPECT_EQ(scale_factor, test_frame_connector_->last_scale_factor_received_);
   }
 }
 
 }  // namespace content