Add Audible support to the whispernet client.

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 <cstdlib>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "media/base/audio_bus.h"
 
 namespace {
 
+const char kFiveZeros[] = "MDAwMDA=";
+const char kSixZeros[] = "MDAwMDAw";
+
 // Copied from src/components/copresence/mediums/audio/audio_recorder.cc
 std::string AudioBusToString(scoped_refptr<media::AudioBusRefCounted> source) {
   std::string buffer;
   buffer.resize(source->frames() * source->channels() * sizeof(float));
   float* buffer_view = reinterpret_cast<float*>(string_as_array(&buffer));
 
   const int channels = source->channels();
   for (int ch = 0; ch < channels; ++ch) {
     for (int si = 0, di = ch; si < source->frames(); ++si, di += channels)
       buffer_view[di] = source->channel(ch)[si];
@@ skipping 18 matching lines @@
     client_.reset(new ChromeWhispernetClient(browser()->profile()));
     extensions::SetWhispernetClientForTesting(client_.get());
 
     client_->Initialize(base::Bind(&ChromeWhispernetClientTest::InitCallback,
                                    base::Unretained(this)));
     run_loop_->Run();
 
     EXPECT_TRUE(initialized_);
   }
 
-  void EncodeTokenAndSaveSamples() {
+  void EncodeTokenAndSaveSamples(bool audible) {
     ASSERT_TRUE(client_);
 
-    // This is the base64 encoding for 000000.
-    const std::string kZeroToken = "MDAwMDAw";
+    // Use a 40bit token for audible encoding, 48bit for inaudible.
+    const std::string kZeros = audible ? kFiveZeros : kSixZeros;
 
     run_loop_.reset(new base::RunLoop());
     client_->RegisterSamplesCallback(base::Bind(
         &ChromeWhispernetClientTest::SamplesCallback, base::Unretained(this)));
-    expected_token_ = kZeroToken;
+    expected_token_ = kZeros;
 
-    client_->EncodeToken(kZeroToken);
+    client_->EncodeToken(kZeros);
     run_loop_->Run();
 
     EXPECT_GT(saved_samples_->frames(), 0);
   }
 
-  void DecodeSamplesAndVerifyToken() {
+  void DecodeSamplesAndVerifyToken(bool audible) {
     ASSERT_TRUE(client_);
 
-    const std::string kZeroToken = "MDAwMDAw";
+    // Use a 40bit token for audible encoding, 48bit for inaudible.
+    const std::string kZeros = audible ? kFiveZeros : kSixZeros;
 
     run_loop_.reset(new base::RunLoop());
     client_->RegisterTokensCallback(base::Bind(
         &ChromeWhispernetClientTest::TokensCallback, base::Unretained(this)));
-    expected_token_ = kZeroToken;
+    expected_token_ = kZeros;

[Charlie, 2014/08/07 17:28:53]

nit: You could also replace kZeros with calls to this:

std::string getToken(bool audible) {
  return audible ? kFiveZeros : kSixZeros;
}

Seems like less duplication with no loss of clarity.

[rkc, 2014/08/07 17:36:58]

Done.

[Charlie, 2014/08/07 17:43:52]

I was thinking you could use getToken() everywhere and just not have kZeroes.
But this is fine too.

On 2014/08/07 17:36:58, Rahul Chaturvedi wrote:

 
     ASSERT_GT(saved_samples_->frames(), 0);
 
     // Convert our single channel samples to two channel. Decode samples
     // expects 2 channel data.
     scoped_refptr<media::AudioBusRefCounted> samples_bus =
         media::AudioBusRefCounted::Create(2, saved_samples_->frames());
     memcpy(samples_bus->channel(0),
            saved_samples_->channel(0),
            sizeof(float) * saved_samples_->frames());
@@ skipping 57 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ChromeWhispernetClientTest);
 };
 
 IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, Initialize) {
   InitializeWhispernet();
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, EncodeToken) {
   InitializeWhispernet();
-  EncodeTokenAndSaveSamples();
+  EncodeTokenAndSaveSamples(false);
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, DecodeSamples) {
   InitializeWhispernet();
-  EncodeTokenAndSaveSamples();
-  DecodeSamplesAndVerifyToken();
+  EncodeTokenAndSaveSamples(false);
+  DecodeSamplesAndVerifyToken(false);
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, DetectBroadcast) {
   InitializeWhispernet();
-  EncodeTokenAndSaveSamples();
-  DecodeSamplesAndVerifyToken();
+  EncodeTokenAndSaveSamples(false);
+  DecodeSamplesAndVerifyToken(false);
   DetectBroadcast();
 }
+
+IN_PROC_BROWSER_TEST_F(ChromeWhispernetClientTest, Audible) {
+  InitializeWhispernet();
+  EncodeTokenAndSaveSamples(true);
+  DecodeSamplesAndVerifyToken(true);
+}