diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 18:01:44 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 18:01:44 +0000 |
| commit | cde701a18446b645c04691ea4298651a96cd0615 (patch) | |
| tree | 24bef8e29c215811d7090f7d2505601b90fa443d /chrome/browser/extensions | |
| parent | 9c7d5f0002b345d68958910fa59f1f9e84dff9c9 (diff) | |
| download | chromium_src-cde701a18446b645c04691ea4298651a96cd0615.zip chromium_src-cde701a18446b645c04691ea4298651a96cd0615.tar.gz chromium_src-cde701a18446b645c04691ea4298651a96cd0615.tar.bz2 | |
Fix test failure introduced with recent change to use salted hashes.
BUG=339840
Review URL: https://codereview.chromium.org/145513009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc index 3f751d5..d1395d1 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc @@ -466,8 +466,14 @@ void WebrtcAudioPrivateGetAssociatedSinkFunction::OnHMACCalculated( const std::string& associated_sink_id) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - results_.reset( - wap::GetAssociatedSink::Results::Create(associated_sink_id).release()); + if (associated_sink_id == media::AudioManagerBase::kDefaultDeviceId) { + DVLOG(2) << "Got default ID, replacing with empty ID."; + results_.reset(wap::GetAssociatedSink::Results::Create("").release()); + } else { + results_.reset( + wap::GetAssociatedSink::Results::Create(associated_sink_id).release()); + } + SendResponse(true); } |