Switch to standard integer types in content/renderer/.

content/renderer/child_frame_compositing_helper.h

 // 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.
 
 #ifndef CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 #define CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
 class SharedMemory;
 }
@@ skipping 38 matching lines @@
  public:
   static ChildFrameCompositingHelper* CreateForBrowserPlugin(
       const base::WeakPtr<BrowserPlugin>& browser_plugin);
   static ChildFrameCompositingHelper* CreateForRenderFrameProxy(
       RenderFrameProxy* render_frame_proxy);
 
   void DidCommitCompositorFrame();
   void OnContainerDestroy();
   void OnCompositorFrameSwapped(scoped_ptr<cc::CompositorFrame> frame,
                                 int route_id,
-                                uint32 output_surface_id,
+                                uint32_t output_surface_id,
                                 int host_id,
                                 base::SharedMemoryHandle handle);
   void OnSetSurface(const cc::SurfaceId& surface_id,
                     const gfx::Size& frame_size,
                     float scale_factor,
                     const cc::SurfaceSequence& sequence);
   void UpdateVisibility(bool);
   void ChildFrameGone();
 
   // cc::DelegatedFrameProviderClient implementation.
@@ skipping 39 matching lines @@
   static void RequireCallbackBrowserPlugin(
       scoped_refptr<ThreadSafeSender> sender,
       int host_routing_id,
       int browser_plugin_instance_id,
       cc::SurfaceId id,
       cc::SurfaceSequence sequence);
   void UpdateWebLayer(blink::WebLayer* layer);
 
   int host_routing_id_;
   int last_route_id_;
-  uint32 last_output_surface_id_;
+  uint32_t last_output_surface_id_;
   int last_host_id_;
   bool ack_pending_;
   bool opaque_;
 
   gfx::Size buffer_size_;
 
   // The lifetime of this weak pointer should be greater than the lifetime of
   // other member objects, as they may access this pointer during their
   // destruction.
   base::WeakPtr<BrowserPlugin> browser_plugin_;
   RenderFrameProxy* render_frame_proxy_;
 
   scoped_refptr<cc::DelegatedFrameResourceCollection> resource_collection_;
   scoped_refptr<cc::DelegatedFrameProvider> frame_provider_;
 
   scoped_ptr<blink::WebLayer> web_layer_;
   blink::WebFrame* frame_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildFrameCompositingHelper);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_CHILD_FRAME_COMPOSITING_HELPER_H_