diff --git a/DEPS b/DEPS
index 62e4e0959f..a918240eb2 100644
--- a/DEPS
+++ b/DEPS
@@ -161,6 +161,12 @@ deps_os = {
     # NSS, for SSLClientSocketNSS.
     "third_party/nss":
       From("chromium_deps", "src/third_party/nss"),
+
+    # TODO(kjellander): remove once bug 2152 is fixed.
+    # This needs to specify the path directly (instead of using the
+    # chromium_deps version) because chromium_deps only defines this for ios.
+    "testing/iossim/third_party/class-dump":
+      Var("chromium_trunk") + "/deps/third_party/class-dump@199203",
   },
 
   "ios": {
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index fb00e0a4e4..2749e8349f 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -1792,19 +1792,19 @@ TEST_F(AudioDeviceAPITest, SetPlayoutSpeaker) {
 #if defined(WEBRTC_IOS)
   // Not playing or recording, should just return a success
   EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(true));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(loudspeakerOn));
+  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
   EXPECT_TRUE(loudspeakerOn);
   EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(false));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(loudspeakerOn));
+  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
   EXPECT_FALSE(loudspeakerOn);
 
   EXPECT_EQ(0, audio_device_->InitPlayout());
   EXPECT_EQ(0, audio_device_->StartPlayout());
   EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(true));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(loudspeakerOn));
+  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
   EXPECT_TRUE(loudspeakerOn);
   EXPECT_EQ(0, audio_device_->SetLoudspeakerStatus(false));
-  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(loudspeakerOn));
+  EXPECT_EQ(0, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
   EXPECT_FALSE(loudspeakerOn);
 
 #else
diff --git a/webrtc/modules/audio_device/test/func_test_manager.cc b/webrtc/modules/audio_device/test/func_test_manager.cc
index 30123d1ba8..9f80282dd1 100644
--- a/webrtc/modules/audio_device/test/func_test_manager.cc
+++ b/webrtc/modules/audio_device/test/func_test_manager.cc
@@ -2688,7 +2688,7 @@ int32_t FuncTestManager::TestAdvancedMBAPI()
         " from the loudspeaker.\n\
 > Press any key to stop...\n \n");
     PAUSE(DEFAULT_PAUSE_TIME);
-    EXPECT_EQ(0, audioDevice->GetLoudspeakerStatus(loudspeakerOn));
+    EXPECT_EQ(0, audioDevice->GetLoudspeakerStatus(&loudspeakerOn));
     EXPECT_TRUE(loudspeakerOn);
 
     TEST_LOG("Set to not use speaker\n");
@@ -2697,7 +2697,7 @@ int32_t FuncTestManager::TestAdvancedMBAPI()
         " from the loudspeaker.\n\
 > Press any key to stop...\n \n");
     PAUSE(DEFAULT_PAUSE_TIME);
-    EXPECT_EQ(0, audioDevice->GetLoudspeakerStatus(loudspeakerOn));
+    EXPECT_EQ(0, audioDevice->GetLoudspeakerStatus(&loudspeakerOn));
     EXPECT_FALSE(loudspeakerOn);
 #endif
 
diff --git a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
index 2fd34e7d5e..e8863c57c4 100644
--- a/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc
@@ -14,10 +14,6 @@
 
 using namespace webrtc;
 
-static const char* kNoDevicesErrorMessage =
-    "Either you have no recording / playout device "
-    "on your system, or the method failed.";
-
 class HardwareBeforeStreamingTest : public AfterInitializationFixture {
 };
 
@@ -51,6 +47,10 @@ TEST_F(HardwareBeforeStreamingTest, ResetsAudioDeviceOnIphone) {
 // Tests that only apply to desktop:
 #if !defined(WEBRTC_IOS) & !defined(WEBRTC_ANDROID)
 
+static const char* kNoDevicesErrorMessage =
+    "Either you have no recording / playout device "
+    "on your system, or the method failed.";
+
 TEST_F(HardwareBeforeStreamingTest, GetPlayoutDeviceStatusReturnsTrue) {
   bool play_available = false;
   EXPECT_EQ(0, voe_hardware_->GetPlayoutDeviceStatus(play_available));