Fixing memory error in ChromeWhispernetClientTest

chrome/browser/copresence/chrome_whispernet_client_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/copresence/chrome_whispernet_client.h"
 
 #include <cmath>
 #include <cstdlib>
 #include <string>
 
@@ skipping 187 matching lines @@
 
     saved_samples_index_ = 0;
     converter_->Convert(converted_samples.get());
 
     return converted_samples;
   }
 
   // AudioConverter::InputCallback overrides:
   double ProvideInput(media::AudioBus* dest,
                       base::TimeDelta /* buffer_delay */) override {
-    int remaining_frames = saved_samples_->frames() - saved_samples_index_;
-    int frames_to_copy = std::min(remaining_frames, dest->frames());
+    // Copy any saved samples we have to the output bus.
+    const int remaining_frames =
+        saved_samples_->frames() - saved_samples_index_;
+    const int frames_to_copy = std::min(remaining_frames, dest->frames());
     saved_samples_stereo_->CopyPartialFramesTo(saved_samples_index_,
                                                frames_to_copy, 0, dest);
     saved_samples_index_ += frames_to_copy;
+
+    // Pad any remaining space with zeroes.
+    for (int i = remaining_frames; i < dest->frames(); i++) {

[DaleCurtis, 2015/03/18 16:52:23]

Should really be dest->ZeroPartialFrames() instead.

+      for (int c = 0; c < dest->channels(); c++)
+        dest->channel(c)[i] = 0;
+    }
+
+    // Return the volume level.
     return 1.0;
   }
 
   scoped_ptr<base::RunLoop> run_loop_;
   bool initialized_;
 
   std::string expected_token_;
   bool expected_audible_;
 
   scoped_refptr<media::AudioBusRefCounted> saved_samples_;
   scoped_refptr<media::AudioBusRefCounted> saved_samples_stereo_;
   int saved_samples_index_;
 
   scoped_ptr<media::AudioConverter> converter_;
 
   media::AudioParameters default_params_;
   media::AudioParameters coder_params_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWhispernetClientTest);
 };
 
 // These tests are irrelevant if NACL is disabled. See crbug.com/449198.
-// TODO(crbug/464120): There is also a problem in Windows debug mode.
-// TODO(crbug/464843): There is also a problem under MSan.
-#if defined(DISABLE_NACL) || \
-    (!defined(NDEBUG) && defined(OS_WIN)) || \

[Lei Zhang, 2015/03/13 23:32:23]

I'm not familiar with this issue, but if you are sure they are gonna go away...

[Charlie, 2015/03/13 23:49:26]

Yes, the windows debug bots are passing after this fix. Or, at least, not
failing on *this* test :-)

Will submit after they pass one more time.

-    defined(MEMORY_SANITIZER)
+#if defined(DISABLE_NACL)
 #define MAYBE_Initialize DISABLED_Initialize
 #define MAYBE_EncodeAndDecode DISABLED_EncodeAndDecode
 #define MAYBE_TokenLengths DISABLED_TokenLengths
 #define MAYBE_Crc DISABLED_Crc
 #define MAYBE_Parity DISABLED_Parity
-#define MAYBE_MultipleClients DISABLED_MultipleClients
 #else
 #define MAYBE_Initialize Initialize
 #define MAYBE_EncodeAndDecode EncodeAndDecode
 #define MAYBE_TokenLengths TokenLengths
 #define MAYBE_Crc Crc
 #define MAYBE_Parity Parity
+#endif
+
+// This test trips up ASAN on ChromeOS. See:
+// https://code.google.com/p/address-sanitizer/issues/detail?id=189
+#if defined(DISABLE_NACL) || defined(OS_CHROMEOS)
+#define MAYBE_MultipleClients DISABLED_MultipleClients
+#else
 #define MAYBE_MultipleClients MultipleClients
 #endif
 
 IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, MAYBE_Initialize) {
   InitializeWhispernet();
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, MAYBE_EncodeAndDecode) {
   scoped_ptr<WhispernetClient> client(
       new ChromeWhispernetClient(browser()->profile()));
@@ skipping 90 matching lines @@
 
   EncodeTokenAndSaveSamples(client_3.get(), true, kSixZeros, token_params);
   DecodeSamplesAndVerifyToken(client_3.get(), true, kSixZeros, token_params);
 
   const size_t kLongTokenLengths[2] = {8, 9};
   GetTokenParamsForLengths(kLongTokenLengths, token_params);
 
   EncodeTokenAndSaveSamples(client_2.get(), true, kEightZeros, token_params);
   DecodeSamplesAndVerifyToken(client_2.get(), true, kEightZeros, token_params);
 }