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"
@@ skipping 41 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";
+    // Base64 encoding for "000000" (or "00000" for audible).
+    const std::string kZeroes = audible ? "MDAwMDA=" : "MDAwMDAw";

[Charlie, 2014/08/07 15:46:47]

Move these to two static const char[]:

const std::string encoded_token = audible ? kaudibleZeroes : kUltrasoundZeroes;

Also add a comment explaining why the encodings are different.

[rkc, 2014/08/07 16:30:41]

Adding 3 constants seems overkill for one value. The encodings are different
because the value they are encoding are different. Isn't that expected?

[Charlie, 2014/08/07 16:43:54]

The point of short constants is to avoid typos and copy/paste errors. If they
were used in just this one test, it would make more sense. But you already have
two, and one can imagine adding more.

Didn't notice the differing number of zeros. Can you make the tokens more
different from each other? Like "00000000" vs. "0000", or "ultrasound" vs.
"audible"? What are the restrictions on tokens?

On 2014/08/07 16:30:41, Rahul Chaturvedi wrote:

[rkc, 2014/08/07 17:17:02]

Added constants, explained token length in comment.
Done.

On 2014/08/07 16:43:54, Charlie wrote:

 
     run_loop_.reset(new base::RunLoop());
     client_->RegisterSamplesCallback(base::Bind(
         &ChromeWhispernetClientTest::SamplesCallback, base::Unretained(this)));
-    expected_token_ = kZeroToken;
+    expected_token_ = kZeroes;
 
-    client_->EncodeToken(kZeroToken);
+    client_->EncodeToken(kZeroes);
     run_loop_->Run();
 
     EXPECT_GT(saved_samples_->frames(), 0);
   }
 
-  void DecodeSamplesAndVerifyToken() {
+  void DecodeSamplesAndVerifyToken(bool audible) {
     ASSERT_TRUE(client_);
 
-    const std::string kZeroToken = "MDAwMDAw";
+    // Base64 encoding for "000000" (or "00000" for audible).
+    const std::string kZeroes = audible ? "MDAwMDA=" : "MDAwMDAw";
 
     run_loop_.reset(new base::RunLoop());
     client_->RegisterTokensCallback(base::Bind(
         &ChromeWhispernetClientTest::TokensCallback, base::Unretained(this)));
-    expected_token_ = kZeroToken;
+    expected_token_ = kZeroes;
 
     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);
+}