Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1712)

Unified Diff: chrome/browser/copresence/chrome_whispernet_client_browsertest.cc

Issue 637223011: Redesign the copresence audio handlers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
diff --git a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
index 43e75dd2a0f46f390d31fa205baab65d387a9a64..0384bb5383c6b98c0a783677385811b1eabb2ddc 100644
--- a/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
+++ b/chrome/browser/copresence/chrome_whispernet_client_browsertest.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "components/copresence/public/copresence_constants.h"
#include "media/base/audio_bus.h"
namespace {
@@ -73,7 +74,8 @@ class ChromeWhispernetClientTest : public ExtensionBrowserTest {
expected_token_ = kSixZeros;
expected_audible_ = audible;
- client->EncodeToken(kSixZeros, audible);
+ client->EncodeToken(kSixZeros,
+ audible ? copresence::AUDIBLE : copresence::INAUDIBLE);
run_loop_->Run();
EXPECT_GT(saved_samples_->frames(), 0);
@@ -102,7 +104,9 @@ class ChromeWhispernetClientTest : public ExtensionBrowserTest {
saved_samples_->channel(0),
sizeof(float) * saved_samples_->frames());
- client->DecodeSamples(AudioBusToString(samples_bus));
+ client->DecodeSamples(
+ expect_audible ? copresence::AUDIBLE : copresence::INAUDIBLE,
+ AudioBusToString(samples_bus));
run_loop_->Run();
}
@@ -128,10 +132,10 @@ class ChromeWhispernetClientTest : public ExtensionBrowserTest {
void SamplesCallback(
const std::string& token,
- bool audible,
+ copresence::AudioType type,
const scoped_refptr<media::AudioBusRefCounted>& samples) {
EXPECT_EQ(expected_token_, token);
- EXPECT_EQ(expected_audible_, audible);
+ EXPECT_EQ(expected_audible_, type == copresence::AUDIBLE);
saved_samples_ = samples;
ASSERT_TRUE(run_loop_);
run_loop_->Quit();
« no previous file with comments | « chrome/browser/copresence/chrome_whispernet_client.cc ('k') | chrome/browser/extensions/api/copresence/copresence_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698