Switch to standard integer types in chromeos/.

chromeos/dbus/fake_cras_audio_client.h

Index: chromeos/dbus/fake_cras_audio_client.h
diff --git a/chromeos/dbus/fake_cras_audio_client.h b/chromeos/dbus/fake_cras_audio_client.h
index cb15ab6b3df7efccd899b5efaabc2d321d431484..7ba80abba7f52a61e74af3b226afd32cbf744a6c 100644
--- a/chromeos/dbus/fake_cras_audio_client.h
+++ b/chromeos/dbus/fake_cras_audio_client.h
@@ -5,6 +5,9 @@
 #ifndef CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_
 #define CHROMEOS_DBUS_FAKE_CRAS_AUDIO_CLIENT_H_
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/cras_audio_client.h"
 
@@ -26,17 +29,17 @@ class CHROMEOS_EXPORT FakeCrasAudioClient : public CrasAudioClient {
   void GetVolumeState(const GetVolumeStateCallback& callback) override;
   void GetNodes(const GetNodesCallback& callback,
                 const ErrorCallback& error_callback) override;
-  void SetOutputNodeVolume(uint64 node_id, int32 volume) override;
+  void SetOutputNodeVolume(uint64_t node_id, int32_t volume) override;
   void SetOutputUserMute(bool mute_on) override;
-  void SetInputNodeGain(uint64 node_id, int32 gain) override;
+  void SetInputNodeGain(uint64_t node_id, int32_t gain) override;
   void SetInputMute(bool mute_on) override;
-  void SetActiveOutputNode(uint64 node_id) override;
-  void SetActiveInputNode(uint64 node_id) override;
-  void AddActiveInputNode(uint64 node_id) override;
-  void RemoveActiveInputNode(uint64 node_id) override;
-  void AddActiveOutputNode(uint64 node_id) override;
-  void RemoveActiveOutputNode(uint64 node_id) override;
-  void SwapLeftRight(uint64 node_id, bool swap) override;
+  void SetActiveOutputNode(uint64_t node_id) override;
+  void SetActiveInputNode(uint64_t node_id) override;
+  void AddActiveInputNode(uint64_t node_id) override;
+  void RemoveActiveInputNode(uint64_t node_id) override;
+  void AddActiveOutputNode(uint64_t node_id) override;
+  void RemoveActiveOutputNode(uint64_t node_id) override;
+  void SwapLeftRight(uint64_t node_id, bool swap) override;
 
   // Modifies an AudioNode from |node_list_| based on |audio_node.id|.
   // if the |audio_node.id| cannot be found in list, Add an
@@ -44,7 +47,7 @@ class CHROMEOS_EXPORT FakeCrasAudioClient : public CrasAudioClient {
   void InsertAudioNodeToList(const AudioNode& audio_node);
 
   // Removes an AudioNode from |node_list_| based on |node_id|.
-  void RemoveAudioNodeFromList(const uint64& node_id);
+  void RemoveAudioNodeFromList(const uint64_t& node_id);
 
   // Updates |node_list_| to contain |audio_nodes|.
   void SetAudioNodesForTesting(const AudioNodeList& audio_nodes);
@@ -54,17 +57,19 @@ class CHROMEOS_EXPORT FakeCrasAudioClient : public CrasAudioClient {
       const AudioNodeList& new_nodes);
 
   const AudioNodeList& node_list() const { return node_list_; }
-  const uint64& active_input_node_id() const { return active_input_node_id_; }
-  const uint64& active_output_node_id() const { return active_output_node_id_; }
+  const uint64_t& active_input_node_id() const { return active_input_node_id_; }
+  const uint64_t& active_output_node_id() const {
+    return active_output_node_id_;
+  }
 
  private:
   // Find a node in the list based on the id.
-  AudioNodeList::iterator FindNode(uint64 node_id);
+  AudioNodeList::iterator FindNode(uint64_t node_id);
 
   VolumeState volume_state_;
   AudioNodeList node_list_;
-  uint64 active_input_node_id_;
-  uint64 active_output_node_id_;
+  uint64_t active_input_node_id_;
+  uint64_t active_output_node_id_;
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeCrasAudioClient);