Delete unneeded includes of base/common.h.

Bulk of the changes were done using

   git grep -l '#include "webrtc/base/common.h"' | \
     xargs sed -i '\,^#include.*webrtc/base/common\.h,d'

followed by adding back the include in the few places where it is
still needed, and in one case (pseudotcp.cc) instead deleting its use
of RTC_UNUSED.

BUG=webrtc:6424

Review-Url: https://codereview.webrtc.org/2644103002
Cr-Commit-Position: refs/heads/master@{#16263}

webrtc/api/dtmfsenderinterface.h

@@ -14,7 +14,6 @@
 #include <string>
 
 #include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/refcount.h"
 
 // This file contains interfaces for DtmfSender.

webrtc/api/notifier.h

@@ -15,7 +15,6 @@
 
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 
 namespace webrtc {
 

webrtc/api/statstypes.h

@@ -20,7 +20,6 @@
 #include <string>
 
 #include "webrtc/base/basictypes.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"

webrtc/base/applefilesystem.mm

@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/pathutils.h"
 
 // Return a new[]'d |char*| copy of the UTF8 representation of |s|.

webrtc/base/asynctcpsocket.cc

@@ -17,7 +17,6 @@
 
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 
 #if defined(WEBRTC_POSIX)

webrtc/base/base64_unittest.cc

@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"

webrtc/base/bitbuffer_unittest.cc

@@ -11,7 +11,6 @@
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/bitbuffer.h"
 #include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 
 namespace rtc {

webrtc/base/bytebuffer_unittest.cc

@@ -11,7 +11,6 @@
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/byteorder.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 
 namespace rtc {

webrtc/base/diskcache.cc

@@ -19,7 +19,6 @@
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/diskcache.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/pathutils.h"

webrtc/base/diskcache_win32.cc

@@ -16,7 +16,6 @@
 #include <time.h>
 #include <algorithm>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/diskcache.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stream.h"

webrtc/base/httpbase.cc

@@ -17,7 +17,6 @@
 #endif  // !WEBRTC_WIN
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/httpbase.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/socket.h"

webrtc/base/httpclient.cc

@@ -13,7 +13,6 @@
 #include <memory>
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/diskcache.h"
 #include "webrtc/base/httpclient.h"
 #include "webrtc/base/httpcommon-inl.h"

webrtc/base/httpclient.h

@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/httpbase.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/proxyinfo.h"

webrtc/base/httpcommon-inl.h

@@ -13,7 +13,6 @@
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/httpcommon.h"
 
 namespace rtc {

webrtc/base/httpcommon.cc

@@ -24,7 +24,6 @@
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/cryptstring.h"
 #include "webrtc/base/httpcommon-inl.h"
 #include "webrtc/base/httpcommon.h"

webrtc/base/httpcommon.h

@@ -17,7 +17,6 @@
 #include <vector>
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/stream.h"
 

webrtc/base/httpserver.cc

@@ -14,7 +14,6 @@
 
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/httpserver.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/socketstream.h"

webrtc/base/macutils.cc

@@ -15,7 +15,6 @@
 #include <sys/utsname.h>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/macutils.h"
 #include "webrtc/base/stringutils.h"

webrtc/base/messagequeue.cc

@@ -11,7 +11,6 @@
 
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/stringencode.h"

webrtc/base/networkmonitor.cc

@@ -11,7 +11,6 @@
 #include "webrtc/base/networkmonitor.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 
 namespace {
 const uint32_t UPDATE_NETWORKS_MESSAGE = 1;

webrtc/base/openssladapter.cc

@@ -27,7 +27,6 @@
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/openssl.h"
 #include "webrtc/base/safe_conversions.h"

webrtc/base/openssldigest.cc

@@ -11,7 +11,6 @@
 #include "webrtc/base/openssldigest.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/openssl.h"
 
 namespace rtc {

webrtc/base/opensslidentity.h

@@ -18,7 +18,6 @@
 #include <string>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/sslidentity.h"
 

webrtc/base/opensslstreamadapter.cc

@@ -25,7 +25,6 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/base/stream.h"

webrtc/base/physicalsocketserver.cc

@@ -43,7 +43,6 @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/networkmonitor.h"
 #include "webrtc/base/nullsocketserver.h"

webrtc/base/rollingaccumulator.h

@@ -15,7 +15,6 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace rtc {

webrtc/base/scoped_autorelease_pool.h

@@ -22,7 +22,6 @@
 
 #if defined(WEBRTC_MAC)
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 
 // This header may be included from Obj-C files or C++ files.

webrtc/base/sharedexclusivelock_unittest.cc

@@ -11,7 +11,6 @@
 #include <memory>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/messagehandler.h"

webrtc/base/signalthread.cc

@@ -11,7 +11,6 @@
 #include "webrtc/base/signalthread.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 
 namespace rtc {
 

webrtc/base/socketadapters.cc

@@ -28,7 +28,6 @@
 
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/httpcommon.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/socketadapters.h"

webrtc/base/socketaddress.cc

@@ -29,7 +29,6 @@
 
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nethelpers.h"
 

webrtc/base/socketstream.h

@@ -12,7 +12,6 @@
 #define WEBRTC_BASE_SOCKETSTREAM_H_
 
 #include "webrtc/base/asyncsocket.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/stream.h"
 

webrtc/base/stream.cc

@@ -20,7 +20,6 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/stream.h"

webrtc/base/stringencode_unittest.cc

@@ -9,7 +9,6 @@
  */
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"

webrtc/base/stringutils_unittest.cc

@@ -10,7 +10,6 @@
 
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/base/common.h"
 
 namespace rtc {
 

webrtc/base/task.cc

@@ -10,7 +10,6 @@
 
 #include "webrtc/base/task.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/taskrunner.h"
 
 namespace rtc {

webrtc/base/task_unittest.cc

@@ -21,7 +21,6 @@
 #endif  // WEBRTC_WIN
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/logging.h"

webrtc/base/taskparent.cc

@@ -13,7 +13,6 @@
 #include "webrtc/base/taskparent.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/task.h"
 #include "webrtc/base/taskrunner.h"
 

webrtc/base/taskrunner.cc

@@ -13,7 +13,6 @@
 #include "webrtc/base/taskrunner.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/task.h"
 #include "webrtc/base/logging.h"
 

webrtc/base/testutils.h

@@ -29,7 +29,6 @@
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/asyncsocket.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/pathutils.h"

webrtc/base/thread.cc

@@ -21,7 +21,6 @@
 #endif
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nullsocketserver.h"
 #include "webrtc/base/platform_thread.h"

webrtc/base/timeutils_unittest.cc

@@ -8,7 +8,6 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/fakeclock.h"
 #include "webrtc/base/gunit.h"

webrtc/base/transformadapter.cc

@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 
 namespace rtc {
 

webrtc/base/virtualsocketserver.cc

@@ -19,7 +19,6 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/physicalsocketserver.h"
 #include "webrtc/base/socketaddresspair.h"

webrtc/base/win32.cc

@@ -18,7 +18,6 @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 
 namespace rtc {

webrtc/base/win32socketserver.cc

@@ -15,7 +15,6 @@
 
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/win32window.h"
 #include "webrtc/base/winping.h"

webrtc/base/win32window_unittest.cc

@@ -9,7 +9,6 @@
  */
 
 #include "webrtc/base/gunit.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/win32window.h"
 #include "webrtc/base/logging.h"
 

webrtc/base/winping.cc

@@ -16,7 +16,6 @@
 
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/ipaddress.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nethelpers.h"

webrtc/common_video/h264/h264_common.h

@@ -14,7 +14,6 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/buffer.h"
 
 namespace webrtc {

webrtc/common_video/h264/pps_parser.h

@@ -11,7 +11,6 @@
 #ifndef WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
 #define WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/optional.h"
 
 namespace rtc {

webrtc/common_video/h264/sps_parser.h

@@ -11,7 +11,6 @@
 #ifndef WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_
 #define WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/optional.h"
 
 namespace rtc {

webrtc/examples/peerconnection/client/conductor.cc

@@ -16,7 +16,6 @@
 
 #include "webrtc/api/test/fakeconstraints.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/json.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"

webrtc/examples/peerconnection/client/defaults.cc

@@ -20,7 +20,6 @@
 #endif
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 
 const char kAudioLabel[] = "audio_label";
 const char kVideoLabel[] = "video_label";

webrtc/examples/peerconnection/client/linux/main_wnd.cc

@@ -18,7 +18,6 @@
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringutils.h"
 

webrtc/examples/peerconnection/client/main_wnd.cc

@@ -17,7 +17,6 @@
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 
 ATOM MainWnd::wnd_class_ = 0;

webrtc/examples/peerconnection/client/peer_connection_client.cc

@@ -12,7 +12,6 @@
 
 #include "webrtc/examples/peerconnection/client/defaults.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/stringutils.h"

webrtc/media/base/videocapturer.cc

@@ -16,7 +16,6 @@
 
 #include "webrtc/api/video/i420_buffer.h"
 #include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 
 namespace cricket {

webrtc/media/base/videocommon.cc

@@ -15,7 +15,6 @@
 #include <sstream>
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 
 namespace cricket {
 

webrtc/media/engine/simulcast.cc

@@ -11,7 +11,6 @@
 #include <stdio.h>
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/engine/simulcast.h"

webrtc/media/engine/webrtcvoiceengine.cc

@@ -22,7 +22,6 @@
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/base64.h"
 #include "webrtc/base/byteorder.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"

webrtc/modules/remote_bitrate_estimator/overuse_detector.cc

@@ -18,7 +18,6 @@
 #include <string>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"

webrtc/modules/remote_bitrate_estimator/test/bwe.cc

@@ -12,7 +12,6 @@
 
 #include <limits>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h"

webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc

@@ -14,7 +14,6 @@
 #include <sstream>
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h"

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc

@@ -14,6 +14,7 @@
 
 #include <sstream>
 
+#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h

@@ -24,7 +24,6 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/random.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"

webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc

@@ -19,7 +19,6 @@
 #include <vector>
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"

webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc

@@ -15,7 +15,6 @@
 #include <numeric>
 
 #include "webrtc/base/arraysize.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet.h"

webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.cc

@@ -12,7 +12,6 @@
 
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h"
 
-#include "webrtc/base/common.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.cc

@@ -12,6 +12,7 @@
 
 #include <algorithm>
 
+#include "webrtc/base/common.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h

@@ -16,7 +16,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/gtest_prod_util.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc

@@ -12,7 +12,6 @@
 
 #include <vector>
 
-#include "webrtc/base/common.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"

webrtc/modules/video_coding/h264_sprop_parameter_sets.h

@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/common.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/p2p/base/asyncstuntcpsocket.cc

@@ -14,7 +14,6 @@
 
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 
 namespace cricket {

webrtc/p2p/base/dtlstransportchannel_unittest.cc

@@ -15,7 +15,6 @@
 #include "webrtc/p2p/base/fakeicetransport.h"
 #include "webrtc/p2p/base/packettransportinterface.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/helpers.h"

webrtc/p2p/base/p2ptransportchannel.cc

@@ -16,7 +16,6 @@
 
 #include "webrtc/api/umametrics.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/crc32.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"

webrtc/p2p/base/pseudotcp.cc

@@ -22,7 +22,6 @@
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/socket.h"
 #include "webrtc/base/stringutils.h"
@@ -539,7 +538,6 @@ IPseudoTcpNotify::WriteResult PseudoTcp::packet(uint32_t seq,
     size_t bytes_read = 0;
     rtc::StreamResult result = m_sbuf.ReadOffset(
         buffer.get() + HEADER_SIZE, len, offset, &bytes_read);
-    RTC_UNUSED(result);
     RTC_DCHECK(result == rtc::SR_SUCCESS);
     RTC_DCHECK(static_cast<uint32_t>(bytes_read) == len);
   }
@@ -1047,7 +1045,6 @@ void PseudoTcp::attemptSend(SendFlags sflags) {
 
 #if _DEBUGMSG
   bool bFirst = true;
-  RTC_UNUSED(bFirst);
 #endif // _DEBUGMSG
 
   while (true) {
@@ -1208,7 +1205,6 @@ void PseudoTcp::parseOptions(const char* data, uint32_t len) {
 
     // Length of this option.
     RTC_DCHECK(len != 0);
-    RTC_UNUSED(len);
     uint8_t opt_len = 0;
     buf.ReadUInt8(&opt_len);
 
@@ -1278,7 +1274,6 @@ void PseudoTcp::resizeReceiveBuffer(uint32_t new_size) {
   // before connection is established or when peers are exchanging connect
   // messages.
   RTC_DCHECK(result);
-  RTC_UNUSED(result);
   m_rbuf_len = new_size;
   m_rwnd_scale = scale_factor;
   m_ssthresh = new_size;

webrtc/p2p/base/stunport.cc

@@ -14,7 +14,6 @@
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/stun.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/ipaddress.h"
 #include "webrtc/base/logging.h"

webrtc/p2p/base/stunrequest.cc

@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"

webrtc/p2p/base/tcpport.cc

@@ -68,7 +68,6 @@
 
 #include "webrtc/p2p/base/common.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 
 namespace cricket {

webrtc/p2p/base/turnport.cc

@@ -17,7 +17,6 @@
 #include "webrtc/base/asyncpacketsocket.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nethelpers.h"
 #include "webrtc/base/socketaddress.h"

webrtc/p2p/client/basicportallocator.cc

@@ -24,7 +24,6 @@
 #include "webrtc/p2p/base/turnport.h"
 #include "webrtc/p2p/base/udpport.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/logging.h"
 

webrtc/p2p/client/socketmonitor.cc

@@ -11,7 +11,6 @@
 #include "webrtc/p2p/client/socketmonitor.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 
 namespace cricket {
 

webrtc/p2p/quic/quicsession_unittest.cc

@@ -23,7 +23,6 @@
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_crypto_server_stream.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/p2p/quic/quicconnectionhelper.h"

webrtc/p2p/quic/quictransportchannel_unittest.cc

@@ -15,7 +15,6 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/common.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"

webrtc/pc/channel.cc

@@ -16,7 +16,6 @@
 #include "webrtc/base/bind.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/copyonwritebuffer.h"
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/logging.h"

webrtc/pc/channelmanager.cc

@@ -14,7 +14,6 @@
 
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"

webrtc/pc/dtmfsender.h

@@ -16,7 +16,6 @@
 #include "webrtc/api/dtmfsenderinterface.h"
 #include "webrtc/api/mediastreaminterface.h"
 #include "webrtc/api/proxy.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/messagehandler.h"
 #include "webrtc/base/refcount.h"

webrtc/pc/mediamonitor.cc

@@ -9,7 +9,6 @@
  */
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/mediamonitor.h"
 

webrtc/pc/srtpfilter.cc

@@ -20,7 +20,6 @@
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/timeutils.h"

webrtc/pc/test/fakeaudiocapturemodule.cc

@@ -11,7 +11,6 @@
 #include "webrtc/pc/test/fakeaudiocapturemodule.h"
 
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/base/timeutils.h"

webrtc/pc/webrtcsdp.cc

@@ -24,7 +24,6 @@
 #include "webrtc/api/jsepsessiondescription.h"
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/messagedigest.h"
 #include "webrtc/base/stringutils.h"

webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc

@@ -18,7 +18,6 @@
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/common.h"
 #include "webrtc/base/ipaddress.h"
 
 namespace webrtc_jni {