Merge third_party/webrtc from https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git at 847dfa535730a30d57cf26d788d31070b70a02af

This commit was generated by merge_from_chromium.py.

Change-Id: Id1e94a534a8e364431bcb714b54729e7a410664d

3 files changed, 5 insertions, 9 deletions

diff --git a/common_audio/common_audio_unittests.isolate b/common_audio/common_audio_unittests.isolate
index 49f1e984..cc5e6ab4 100644
--- a/common_audio/common_audio_unittests.isolate
+++ b/common_audio/common_audio_unittests.isolate
@@ -8,27 +8,25 @@
 {
   'conditions': [
     ['OS=="android"', {
-      # When doing Android builds, the WebRTC code is put in third_party/webrtc
-      # of a Chromium checkout, this is one level above the standalone build.
       'variables': {
         'isolate_dependency_untracked': [
-          '../../../data/',
-          '../../../resources/',
+          '<(DEPTH)/data/',
+          '<(DEPTH)/resources/',
         ],
       },
     }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
-          '../../testing/test_env.py',
+          '<(DEPTH)/testing/test_env.py',
           '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_tracked': [
-          '../../testing/test_env.py',
+          '<(DEPTH)/testing/test_env.py',
           '<(PRODUCT_DIR)/common_audio_unittests<(EXECUTABLE_SUFFIX)',
         ],
         'isolate_dependency_untracked': [
-          '../../tools/swarming_client/',
+          '<(DEPTH)/tools/swarming_client/',
         ],
       },
     }],
diff --git a/common_audio/signal_processing/include/signal_processing_library.h b/common_audio/signal_processing/include/signal_processing_library.h
index 69023b26..3a5d51cc 100644
--- a/common_audio/signal_processing/include/signal_processing_library.h
+++ b/common_audio/signal_processing/include/signal_processing_library.h
@@ -123,7 +123,6 @@
 #define WEBRTC_SPL_RSHIFT_W32(x, c)     ((x) >> (c))
 #define WEBRTC_SPL_LSHIFT_W32(x, c)     ((x) << (c))
 
-#define WEBRTC_SPL_LSHIFT_U16(x, c)     ((uint16_t)(x) << (c))
 #define WEBRTC_SPL_RSHIFT_U32(x, c)     ((uint32_t)(x) >> (c))
 #define WEBRTC_SPL_LSHIFT_U32(x, c)     ((uint32_t)(x) << (c))
 
diff --git a/common_audio/signal_processing/signal_processing_unittest.cc b/common_audio/signal_processing/signal_processing_unittest.cc
index 48f6eb3a..81ca3694 100644
--- a/common_audio/signal_processing/signal_processing_unittest.cc
+++ b/common_audio/signal_processing/signal_processing_unittest.cc
@@ -89,7 +89,6 @@ TEST_F(SplTest, MacroTest) {
     EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_W32(a, 1));
     EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_W32(a, 1));
 
-    EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_U16(a, 1));
     EXPECT_EQ(8191u, WEBRTC_SPL_RSHIFT_U32(a, 1));
     EXPECT_EQ(32766u, WEBRTC_SPL_LSHIFT_U32(a, 1));