Switch to standard integer types in cc/.

cc/output/output_surface.cc

 // Copyright (c) 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.
 
 #include "cc/output/output_surface.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/managed_memory_policy.h"
 #include "cc/output/output_surface_client.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/skia/include/core/SkTraceMemoryDump.h"
 #include "third_party/skia/include/gpu/GrContext.h"
@@ skipping 27 matching lines @@
                         const char* value_name,
                         const char* units,
                         uint64_t value) override {
     auto dump = GetOrCreateAllocatorDump(dump_name);
     dump->AddScalar(value_name, units, value);
   }
 
   void setMemoryBacking(const char* dump_name,
                         const char* backing_type,
                         const char* backing_object_id) override {
-    const uint64 tracing_process_id =
+    const uint64_t tracing_process_id =
         base::trace_event::MemoryDumpManager::GetInstance()
             ->GetTracingProcessId();
 
     // For uniformity, skia provides this value as a string. Convert back to a
     // uint32_t.
     uint32_t gl_id =
         std::strtoul(backing_object_id, nullptr /* str_end */, 10 /* base */);
 
     // Populated in if statements below.
     base::trace_event::MemoryAllocatorDumpGuid guid;
@@ skipping 284 matching lines @@
   if (context_provider_.get()) {
     context_provider_->SetLostContextCallback(
         ContextProvider::LostContextCallback());
   }
   context_provider_ = nullptr;
   client_ = nullptr;
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace cc