Switch to standard integer types in content/browser/.

content/browser/tracing/memory_tracing_browsertest.cc

 // 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.
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/memory_dump_manager.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "base/trace_event/memory_dump_request_args.h"
 #include "base/trace_event/trace_config_memory_test_util.h"
 #include "content/public/browser/tracing_controller.h"
 #include "content/public/common/content_switches.h"
@@ skipping 25 matching lines @@
   void DoRequestGlobalDump(const base::trace_event::MemoryDumpCallback& cb) {
     MemoryDumpManager::GetInstance()->RequestGlobalDump(
         MemoryDumpType::EXPLICITLY_TRIGGERED,
         base::trace_event::MemoryDumpLevelOfDetail::DETAILED, cb);
   }
 
   // Used as callback argument for MemoryDumpManager::RequestGlobalDump():
   void OnGlobalMemoryDumpDone(
       scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       base::Closure closure,
-      uint64 dump_guid,
+      uint64_t dump_guid,
       bool success) {
     // Make sure we run the RunLoop closure on the same thread that originated
     // the run loop (which is the IN_PROC_BROWSER_TEST_F main thread).
     if (!task_runner->RunsTasksOnCurrentThread()) {
       task_runner->PostTask(
           FROM_HERE, base::Bind(&MemoryTracingTest::OnGlobalMemoryDumpDone,
                                 base::Unretained(this), task_runner, closure,
                                 dump_guid, success));
       return;
     }
@@ skipping 57 matching lines @@
     }
     run_loop.Run();
   }
 
   void Navigate(Shell* shell) {
     NavigateToURL(shell, GetTestUrl("", "title.html"));
   }
 
   base::Closure on_memory_dump_complete_closure_;
   scoped_ptr<MockDumpProvider> mock_dump_provider_;
-  uint32 callback_call_count_;
-  uint64 last_callback_dump_guid_;
+  uint32_t callback_call_count_;
+  uint64_t last_callback_dump_guid_;
   bool last_callback_success_;
 };
 
 // Ignore SingleProcessMemoryTracingTests for Google Chrome builds because
 // single-process is not supported on those builds.
 #if !defined(GOOGLE_CHROME_BUILD)
 
 class SingleProcessMemoryTracingTest : public MemoryTracingTest {
  public:
   SingleProcessMemoryTracingTest() {}
@@ skipping 81 matching lines @@
 
   EnableMemoryTracing();
   RequestGlobalDumpAndWait(false /* from_renderer_thread */);
   EXPECT_EQ(1u, callback_call_count_);
   EXPECT_NE(0u, last_callback_dump_guid_);
   EXPECT_TRUE(last_callback_success_);
   DisableTracing();
 }
 
 }  // namespace content