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

Unified Diff: android_webview/browser/permission/media_access_permission_request_unittest.cc

Issue 2863233002: [WebView] Move files from native to browser (Closed)
Patch Set: Created 3 years, 7 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: android_webview/browser/permission/media_access_permission_request_unittest.cc
diff --git a/android_webview/native/permission/media_access_permission_request_unittest.cc b/android_webview/browser/permission/media_access_permission_request_unittest.cc
similarity index 85%
rename from android_webview/native/permission/media_access_permission_request_unittest.cc
rename to android_webview/browser/permission/media_access_permission_request_unittest.cc
index a34f6f9af0946fe477ebfe3db1f992014f5768b5..402ee349d77d76e6bc40f4b023dd2f4dcf39d8cf 100644
--- a/android_webview/native/permission/media_access_permission_request_unittest.cc
+++ b/android_webview/browser/permission/media_access_permission_request_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "android_webview/native/permission/media_access_permission_request.h"
+#include "android_webview/browser/permission/media_access_permission_request.h"
#include "base/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -34,20 +34,16 @@ class MediaAccessPermissionRequestTest : public testing::Test {
std::string audio_id,
std::string video_id) {
content::MediaStreamDevices audio_devices;
- audio_devices.push_back(
- content::MediaStreamDevice(content::MEDIA_DEVICE_AUDIO_CAPTURE,
- first_audio_device_id_, "a2"));
- audio_devices.push_back(
- content::MediaStreamDevice(content::MEDIA_DEVICE_AUDIO_CAPTURE,
- audio_device_id_, "a1"));
+ audio_devices.push_back(content::MediaStreamDevice(
+ content::MEDIA_DEVICE_AUDIO_CAPTURE, first_audio_device_id_, "a2"));
+ audio_devices.push_back(content::MediaStreamDevice(
+ content::MEDIA_DEVICE_AUDIO_CAPTURE, audio_device_id_, "a1"));
content::MediaStreamDevices video_devices;
- video_devices.push_back(
- content::MediaStreamDevice(content::MEDIA_DEVICE_VIDEO_CAPTURE,
- first_video_device_id_, "v2"));
- video_devices.push_back(
- content::MediaStreamDevice(content::MEDIA_DEVICE_VIDEO_CAPTURE,
- video_device_id_, "v1"));
+ video_devices.push_back(content::MediaStreamDevice(
+ content::MEDIA_DEVICE_VIDEO_CAPTURE, first_video_device_id_, "v2"));
+ video_devices.push_back(content::MediaStreamDevice(
+ content::MEDIA_DEVICE_VIDEO_CAPTURE, video_device_id_, "v1"));
GURL origin("https://www.google.com");
content::MediaStreamRequest request(
@@ -70,6 +66,7 @@ class MediaAccessPermissionRequestTest : public testing::Test {
std::string first_video_device_id_;
content::MediaStreamDevices devices_;
content::MediaStreamRequestResult result_;
+
private:
void Callback(const content::MediaStreamDevices& devices,
content::MediaStreamRequestResult result,

Powered by Google App Engine
This is Rietveld 408576698