Switch to standard integer types in chromeos/.

chromeos/audio/cras_audio_handler_unittest.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 "chromeos/audio/cras_audio_handler.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chromeos/audio/audio_devices_pref_handler_stub.h"
 #include "chromeos/dbus/audio_node.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_cras_audio_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace {
 
-const uint64 kInternalSpeakerId = 10001;
-const uint64 kHeadphoneId = 10002;
-const uint64 kInternalMicId = 10003;
-const uint64 kUSBMicId = 10004;
-const uint64 kBluetoothHeadsetId = 10005;
-const uint64 kHDMIOutputId = 10006;
-const uint64 kUSBHeadphoneId1 = 10007;
-const uint64 kUSBHeadphoneId2 = 10008;
-const uint64 kMicJackId = 10009;
-const uint64 kKeyboardMicId = 10010;
-const uint64 kOtherTypeOutputId = 90001;
-const uint64 kOtherTypeInputId = 90002;
-const uint64 kUSBJabraSpeakerOutputId1 = 90003;
-const uint64 kUSBJabraSpeakerOutputId2 = 90004;
-const uint64 kUSBJabraSpeakerInputId1 = 90005;
-const uint64 kUSBJabraSpeakerInputId2 = 90006;
-const uint64 kUSBCameraInputId = 90007;
+const uint64_t kInternalSpeakerId = 10001;
+const uint64_t kHeadphoneId = 10002;
+const uint64_t kInternalMicId = 10003;
+const uint64_t kUSBMicId = 10004;
+const uint64_t kBluetoothHeadsetId = 10005;
+const uint64_t kHDMIOutputId = 10006;
+const uint64_t kUSBHeadphoneId1 = 10007;
+const uint64_t kUSBHeadphoneId2 = 10008;
+const uint64_t kMicJackId = 10009;
+const uint64_t kKeyboardMicId = 10010;
+const uint64_t kOtherTypeOutputId = 90001;
+const uint64_t kOtherTypeInputId = 90002;
+const uint64_t kUSBJabraSpeakerOutputId1 = 90003;
+const uint64_t kUSBJabraSpeakerOutputId2 = 90004;
+const uint64_t kUSBJabraSpeakerInputId1 = 90005;
+const uint64_t kUSBJabraSpeakerInputId2 = 90006;
+const uint64_t kUSBCameraInputId = 90007;
 
 const AudioNode kInternalSpeaker(
     false,
     kInternalSpeakerId,
     "Fake Speaker",
     "INTERNAL_SPEAKER",
     "Speaker",
     false,
     0
 );
@@ skipping 208 matching lines @@
 
   void OnOutputMuteChanged(bool /* mute_on */, bool system_adjust) override {
     ++output_mute_changed_count_;
     output_mute_by_system_ = system_adjust;
   }
 
   void OnInputMuteChanged(bool /* mute_on */) override {
     ++input_mute_changed_count_;
   }
 
-  void OnOutputNodeVolumeChanged(uint64 /* node_id */,
+  void OnOutputNodeVolumeChanged(uint64_t /* node_id */,
                                  int /* volume */) override {
     ++output_volume_changed_count_;
   }
 
-  void OnInputNodeGainChanged(uint64 /* node_id */, int /* gain */) override {
+  void OnInputNodeGainChanged(uint64_t /* node_id */, int /* gain */) override {
     ++input_gain_changed_count_;
   }
 
  private:
   int active_output_node_changed_count_;
   int active_input_node_changed_count_;
   int audio_nodes_changed_count_;
   int output_mute_changed_count_;
   int input_mute_changed_count_;
   int output_volume_changed_count_;
@@ skipping 50 matching lines @@
     cras_audio_handler_->AddAudioObserver(test_observer_.get());
     message_loop_.RunUntilIdle();
   }
 
   void ChangeAudioNodes(const AudioNodeList& audio_nodes) {
     fake_cras_audio_client_->SetAudioNodesAndNotifyObserversForTesting(
         audio_nodes);
     message_loop_.RunUntilIdle();
   }
 
-  const AudioDevice* GetDeviceFromId(uint64 id) {
+  const AudioDevice* GetDeviceFromId(uint64_t id) {
     return cras_audio_handler_->GetDeviceFromId(id);
   }
 
   int GetActiveDeviceCount() const {
     int num_active_nodes = 0;
     AudioDeviceList audio_devices;
     cras_audio_handler_->GetAudioDevices(&audio_devices);
     for (size_t i = 0; i < audio_devices.size(); ++i) {
       if (audio_devices[i].active)
         ++num_active_nodes;
@@ skipping 2296 matching lines @@
       cras_audio_handler_->GetPrimaryActiveOutputDevice(&active_output));
   EXPECT_EQ(kInternalSpeaker.id, active_output.id);
   EXPECT_EQ(kInternalSpeaker.id,
             cras_audio_handler_->GetPrimaryActiveOutputNode());
   EXPECT_FALSE(cras_audio_handler_->IsOutputMuted());
   EXPECT_EQ(1, test_observer_->output_mute_changed_count());
   EXPECT_TRUE(test_observer_->output_mute_by_system());
 }
 
 }  // namespace chromeos