Replace WEBRTC_TRACE logging in modules/audio_device/linux/

Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
TBR=henrika@webrtc.org

Review-Url: https://codereview.webrtc.org/2978083002
Cr-Commit-Position: refs/heads/master@{#19071}
Committed: https://chromium.googlesource.com/external/webrtc/+/43a85f03435f92306e3626fdc00352bbdd0d21a0

[saza WebRTC, 2017-07-17 14:59:12]

Description was changed from

==========
script

BUG=webrtc:5118
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables

BUG=webrtc:5118
==========

[saza WebRTC, 2017-07-17 14:59:12]

saza@webrtc.org changed reviewers:
+ henrika@webrtc.org

[saza WebRTC, 2017-07-17 14:59:45]

Description was changed from

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables

BUG=webrtc:5118
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited.

BUG=webrtc:5118
==========

[saza WebRTC, 2017-07-17 14:59:54]

Description was changed from

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited.

BUG=webrtc:5118
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
==========

[saza WebRTC, 2017-07-17 15:00:33]

ptal

[henrika_webrtc, 2017-07-17 15:03:02]

lgtm

[saza WebRTC, 2017-07-18 08:05:56]

The CQ bit was checked by saza@webrtc.org

[commit-bot: I haz the power, 2017-07-18 08:06:07]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-07-18 08:06:09]

This CL has an open dependency (Issue 2978083002 Patch 1). Please resolve the
dependency and try again.
If you are sure that there is no real dependency, please use one of the options
listed in https://goo.gl/9Es4OR to land the CL.

[saza WebRTC, 2017-07-18 08:09:48]

Description was changed from

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
NO_DEPENDENCY_CHECKS=true
==========

[saza WebRTC, 2017-07-18 08:10:01]

The CQ bit was checked by saza@webrtc.org

[commit-bot: I haz the power, 2017-07-18 08:10:07]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-07-18 08:41:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-07-18 08:41:23]

Failed to apply patch for
webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc:
While running git apply --index -3 -p1;
  error: patch failed:
webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc:24
  error: repository lacks the necessary blob to fall back on 3-way merge.
  error: webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc:
patch does not apply

Patch:       webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
Index: webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
index
8907e4a266622ea6900cef5106822087afc028d8..8bc63c3806f2f29cae493d3036be4a557b04ff9c
100644
--- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
+++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc
@@ -11,7 +11,7 @@
 #include <assert.h>
 
 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
-#include "webrtc/system_wrappers/include/trace.h"
+#include "webrtc/rtc_base/logging.h"
 
 extern webrtc::adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
 
@@ -24,14 +24,13 @@ extern webrtc::adm_linux_alsa::AlsaSymbolTable
AlsaSymbolTable;
 namespace webrtc
 {
 
-AudioMixerManagerLinuxALSA::AudioMixerManagerLinuxALSA(const int32_t id) :
-    _id(id),
+AudioMixerManagerLinuxALSA::AudioMixerManagerLinuxALSA() :
     _outputMixerHandle(NULL),
     _inputMixerHandle(NULL),
     _outputMixerElement(NULL),
     _inputMixerElement(NULL)
 {
-    LOG(LS_INFO) << __FUNCTION__ << " constructed";
+    LOG(LS_INFO) << __FUNCTION__ << " created";
 
     memset(_outputMixerStr, 0, kAdmMaxDeviceNameSize);
     memset(_inputMixerStr, 0, kAdmMaxDeviceNameSize);
@@ -39,7 +38,7 @@ AudioMixerManagerLinuxALSA::AudioMixerManagerLinuxALSA(const
int32_t id) :
 
 AudioMixerManagerLinuxALSA::~AudioMixerManagerLinuxALSA()
 {
-    LOG(LS_INFO) << __FUNCTION__ << " destructed";
+    LOG(LS_INFO) << __FUNCTION__ << " destroyed";
     Close();
 }
 
@@ -80,7 +79,7 @@ int32_t AudioMixerManagerLinuxALSA::CloseSpeaker()
         errVal = LATE(snd_mixer_detach)(_outputMixerHandle, _outputMixerStr);
         if (errVal < 0)
         {
-            LOG(LS_ERROR) << "Error detachinging playout mixer: "
+            LOG(LS_ERROR) << "Error detaching playout mixer: "
                           << LATE(snd_strerror)(errVal);
         }
         errVal = LATE(snd_mixer_close)(_outputMixerHandle);
@@ -120,7 +119,7 @@ int32_t AudioMixerManagerLinuxALSA::CloseMicrophone()
         errVal = LATE(snd_mixer_detach)(_inputMixerHandle, _inputMixerStr);
         if (errVal < 0)
         {
-            LOG(LS_ERROR) << "Error detachinging record mixer: "
+            LOG(LS_ERROR) << "Error detaching record mixer: "
                           << LATE(snd_strerror)(errVal);
         }
         LOG(LS_VERBOSE) << "Closing record mixer 3";
@@ -165,7 +164,7 @@ int32_t AudioMixerManagerLinuxALSA::OpenSpeaker(char*
deviceName)
         errVal = LATE(snd_mixer_detach)(_outputMixerHandle, _outputMixerStr);
         if (errVal < 0)
         {
-            LOG(LS_ERROR) << "Error detachinging playout mixer: "
+            LOG(LS_ERROR) << "Error detaching playout mixer: "
                           << LATE(snd_strerror)(errVal);
         }
         errVal = LATE(snd_mixer_close)(_outputMixerHandle);
@@ -205,8 +204,8 @@ int32_t AudioMixerManagerLinuxALSA::OpenSpeaker(char*
deviceName)
     if (errVal < 0)
     {
         LOG(LS_ERROR)
-            << "snd_mixer_selem_register(_outputMixerHandle, NULL, NULL),
error: "
-            << LATE(snd_strerror)(errVal);
+            << "snd_mixer_selem_register(_outputMixerHandle, NULL, NULL), "
+            << "error: " << LATE(snd_strerror)(errVal);
         _outputMixerHandle = NULL;
         return -1;
     }
@@ -219,7 +218,7 @@ int32_t AudioMixerManagerLinuxALSA::OpenSpeaker(char*
deviceName)
 
     if (_outputMixerHandle != NULL)
     {
-        LOG(LS_VERBOSE) << "the output mixer device is now open (0x"
+        LOG(LS_VERBOSE) << "the output mixer device is now open ("
                         << _outputMixerHandle << ")";
     }
 
@@ -252,7 +251,7 @@ int32_t AudioMixerManagerLinuxALSA::OpenMicrophone(char
*deviceName)
         errVal = LATE(snd_mixer_detach)(_inputMixerHandle, _inputMixerStr);
         if (errVal < 0)
         {
-            LOG(LS_ERROR) << "Error detachinging record mixer: "
+            LOG(LS_ERROR) << "Error detaching record mixer: "
                           << LATE(snd_strerror)(errVal);
         }
         LOG(LS_VERBOSE) << "Closing record mixer";
@@ -296,8 +295,8 @@ int32_t AudioMixerManagerLinuxALSA::OpenMicrophone(char
*deviceName)
     if (errVal < 0)
     {
         LOG(LS_ERROR)
-            << "snd_mixer_selem_register(_inputMixerHandle, NULL, NULL), error:
"
-            << LATE(snd_strerror)(errVal);
+            << "snd_mixer_selem_register(_inputMixerHandle, NULL, NULL), "
+            << "error: " << LATE(snd_strerror)(errVal);
 
         _inputMixerHandle = NULL;
         return -1;
@@ -310,7 +309,7 @@ int32_t AudioMixerManagerLinuxALSA::OpenMicrophone(char
*deviceName)
 
     if (_inputMixerHandle != NULL)
     {
-        LOG(LS_VERBOSE) << "the input mixer device is now open (0x"
+        LOG(LS_VERBOSE) << "the input mixer device is now open ("
                         << _inputMixerHandle << ")";
     }

[saza WebRTC, 2017-07-18 10:40:58]

On 2017/07/18 08:41:23, commit-bot: I haz the power wrote:
> Failed to apply patch for
> webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc:
> While running git apply --index -3 -p1;
>   error: patch failed:
> ...
I have accidentally dependency deadlocked these patch sets.
I will add a third patch set, identical to the current, with no dependencies.

[saza WebRTC, 2017-07-18 10:44:12]

Patchset #3 (id:40001) has been deleted

[saza WebRTC, 2017-07-18 10:52:02]

Description was changed from

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
NO_DEPENDENCY_CHECKS=true
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
TBR=henrika@webrtc.org
NO_DEPENDENCY_CHECKS=true
==========

[saza WebRTC, 2017-07-18 10:52:13]

Description was changed from

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
TBR=henrika@webrtc.org
NO_DEPENDENCY_CHECKS=true
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
TBR=henrika@webrtc.org
==========

[saza WebRTC, 2017-07-18 10:52:49]

The CQ bit was checked by saza@webrtc.org

[saza WebRTC, 2017-07-18 10:52:50]

The patchset sent to the CQ was uploaded after l-g-t-m from henrika@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2978083002/#ps60001 (title:
"Identical, no deps.")

[commit-bot: I haz the power, 2017-07-18 10:52:58]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2017-07-18 11:12:30]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1500375169742800,
"parent_rev": "0f2f169a6e936798b29c93aafd21a51753bf4915", "commit_rev":
"43a85f03435f92306e3626fdc00352bbdd0d21a0"}

[commit-bot: I haz the power, 2017-07-18 11:12:34]

Description was changed from

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
TBR=henrika@webrtc.org
==========

to

==========
Patch set 1:
Run a script to replace occurrences of WEBRTC_TRACE logging with the new
style, on webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc.

Patch set 2:
 - Manually fix log lines not handled by the script
 - Adjust some lines, to conform with code style
 - Update the included headers
 - Remove the now unused object ID variables
 -  - This explains why there's so many files edited

BUG=webrtc:5118
TBR=henrika@webrtc.org

Review-Url: https://codereview.webrtc.org/2978083002
Cr-Commit-Position: refs/heads/master@{#19071}
Committed:
https://chromium.googlesource.com/external/webrtc/+/43a85f03435f92306e3626fdc...
==========

[commit-bot: I haz the power, 2017-07-18 11:12:35]

Committed patchset #3 (id:60001) as
https://chromium.googlesource.com/external/webrtc/+/43a85f03435f92306e3626fdc...