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

Unified Diff: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

Issue 2820163002: Move MediaDeviceIDSalt from ProfileIOData to ProfileImpl. (Closed)
Patch Set: Fix Created 3 years, 8 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/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
index 0be10ce1e7a11e32e424ed808e0e6a740b0c7b14..537041c4c34f676ef62a63a2031910f8dd3f2b35 100644
--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
@@ -23,6 +23,7 @@
#include "chrome/browser/extensions/extension_function_test_utils.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/media/webrtc/webrtc_log_uploader.h"
+#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/features.h"
@@ -156,7 +157,7 @@ class WebrtcAudioPrivateTest : public AudioWaitingExtensionTest {
// device id in the |origin| on the IO thread. On return,
// |id_in_origin| contains the id |raw_device_id| is known by in
// the origin.
- void GetIDInOrigin(content::ResourceContext* resource_context,
+ void GetIDInOrigin(Profile* profile,
GURL origin,
const std::string& raw_device_id,
std::string* id_in_origin) {
@@ -164,13 +165,12 @@ class WebrtcAudioPrivateTest : public AudioWaitingExtensionTest {
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
base::Bind(&WebrtcAudioPrivateTest::GetIDInOrigin,
- base::Unretained(this),
- resource_context, origin, raw_device_id, id_in_origin));
+ base::Unretained(this), profile, origin, raw_device_id,
+ id_in_origin));
enumeration_event_.Wait();
} else {
*id_in_origin = content::GetHMACForMediaDeviceID(
- resource_context->GetMediaDeviceIDSalt(), url::Origin(origin),
- raw_device_id);
+ profile->GetMediaDeviceIDSalt(), url::Origin(origin), raw_device_id);
enumeration_event_.Signal();
}
}
@@ -212,9 +212,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcAudioPrivateTest, GetSinks) {
if (media::AudioDeviceDescription::IsDefaultDevice(it->unique_id)) {
expected_id = media::AudioDeviceDescription::kDefaultDeviceId;
} else {
- GetIDInOrigin(profile()->GetResourceContext(),
- source_url_.GetOrigin(),
- it->unique_id,
+ GetIDInOrigin(profile(), source_url_.GetOrigin(), it->unique_id,
&expected_id);
}
@@ -350,10 +348,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcAudioPrivateTest, GetAssociatedSink) {
VLOG(2) << "Trying to find associated sink for device " << raw_device_id;
std::string source_id_in_origin;
GURL origin(GURL("http://www.google.com/").GetOrigin());
- GetIDInOrigin(profile()->GetResourceContext(),
- origin,
- raw_device_id,
- &source_id_in_origin);
+ GetIDInOrigin(profile(), origin, raw_device_id, &source_id_in_origin);
base::ListValue parameters;
parameters.AppendString(origin.spec());

Powered by Google App Engine
This is Rietveld 408576698