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

Side by Side Diff: chrome/browser/media/webrtc_browsertest_base.cc

Issue 293123009: Cleaned up WebRTC browser test js, removed unneeded stuff. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/media/webrtc_browsertest_base.h" 5 #include "chrome/browser/media/webrtc_browsertest_base.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
11 #include "chrome/browser/infobars/infobar_service.h" 11 #include "chrome/browser/infobars/infobar_service.h"
12 #include "chrome/browser/media/media_stream_infobar_delegate.h" 12 #include "chrome/browser/media/media_stream_infobar_delegate.h"
13 #include "chrome/browser/media/webrtc_browsertest_common.h" 13 #include "chrome/browser/media/webrtc_browsertest_common.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_tabstrip.h" 15 #include "chrome/browser/ui/browser_tabstrip.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "components/infobars/core/infobar.h" 18 #include "components/infobars/core/infobar.h"
19 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
20 #include "content/public/test/browser_test_utils.h" 20 #include "content/public/test/browser_test_utils.h"
21 #include "net/test/embedded_test_server/embedded_test_server.h" 21 #include "net/test/embedded_test_server/embedded_test_server.h"
22 22
23 const char WebRtcTestBase::kAudioVideoCallConstraints[] = 23 const char WebRtcTestBase::kAudioVideoCallConstraints[] =
24 "'{audio: true, video: true}'"; 24 "{audio: true, video: true}";
25 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] = 25 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] =
26 "'{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, " 26 "{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, "
27 " minHeight: 240, maxHeight: 240}}}'"; 27 " minHeight: 240, maxHeight: 240}}}";
28 const char WebRtcTestBase::kAudioVideoCallConstraints360p[] = 28 const char WebRtcTestBase::kAudioVideoCallConstraints360p[] =
29 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " 29 "{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, "
30 " minHeight: 360, maxHeight: 360}}}'"; 30 " minHeight: 360, maxHeight: 360}}}";
31 const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] = 31 const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] =
32 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " 32 "{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, "
33 " minHeight: 480, maxHeight: 480}}}'"; 33 " minHeight: 480, maxHeight: 480}}}";
34 const char WebRtcTestBase::kAudioVideoCallConstraints720p[] = 34 const char WebRtcTestBase::kAudioVideoCallConstraints720p[] =
35 "'{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, " 35 "{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, "
36 " minHeight: 720, maxHeight: 720}}}'"; 36 " minHeight: 720, maxHeight: 720}}}";
37 const char WebRtcTestBase::kAudioVideoCallConstraints1080p[] = 37 const char WebRtcTestBase::kAudioVideoCallConstraints1080p[] =
38 "'{audio: true, video: {mandatory: {minWidth: 1920, maxWidth: 1920, " 38 "{audio: true, video: {mandatory: {minWidth: 1920, maxWidth: 1920, "
39 " minHeight: 1080, maxHeight: 1080}}}'"; 39 " minHeight: 1080, maxHeight: 1080}}}";
40 const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "'{audio: true}'"; 40 const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "{audio: true}";
41 const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "'{video: true}'"; 41 const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "{video: true}";
42 const char WebRtcTestBase::kFailedWithPermissionDeniedError[] = 42 const char WebRtcTestBase::kFailedWithPermissionDeniedError[] =
43 "failed-with-error-PermissionDeniedError"; 43 "failed-with-error-PermissionDeniedError";
44 const char WebRtcTestBase::kFailedWithPermissionDismissedError[] = 44 const char WebRtcTestBase::kFailedWithPermissionDismissedError[] =
45 "failed-with-error-PermissionDismissedError"; 45 "failed-with-error-PermissionDismissedError";
46 46
47 namespace { 47 namespace {
48 48
49 base::LazyInstance<bool> hit_javascript_errors_ = 49 base::LazyInstance<bool> hit_javascript_errors_ =
50 LAZY_INSTANCE_INITIALIZER; 50 LAZY_INSTANCE_INITIALIZER;
51 51
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 EXPECT_TRUE(StartsWithASCII(result, "ok-", true)); 340 EXPECT_TRUE(StartsWithASCII(result, "ok-", true));
341 return result.substr(3); 341 return result.substr(3);
342 } 342 }
343 343
344 bool WebRtcTestBase::HasWebcamAvailableOnSystem( 344 bool WebRtcTestBase::HasWebcamAvailableOnSystem(
345 content::WebContents* tab_contents) const { 345 content::WebContents* tab_contents) const {
346 std::string result = 346 std::string result =
347 ExecuteJavascript("HasVideoSourceOnSystem();", tab_contents); 347 ExecuteJavascript("HasVideoSourceOnSystem();", tab_contents);
348 return result == "has-video-source"; 348 return result == "has-video-source";
349 } 349 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/webrtc/getusermedia.js » ('j') | chrome/test/data/webrtc/getusermedia.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698