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

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: Rebased Created 6 years, 6 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 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 // For fine-grained suppression. 24 // For fine-grained suppression.
25 #include "base/win/windows_version.h" 25 #include "base/win/windows_version.h"
26 #endif 26 #endif
27 27
28 const char WebRtcTestBase::kAudioVideoCallConstraints[] = 28 const char WebRtcTestBase::kAudioVideoCallConstraints[] =
29 "'{audio: true, video: true}'"; 29 "{audio: true, video: true}";
30 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] = 30 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] =
31 "'{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, " 31 "{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, "
32 " minHeight: 240, maxHeight: 240}}}'"; 32 " minHeight: 240, maxHeight: 240}}}";
33 const char WebRtcTestBase::kAudioVideoCallConstraints360p[] = 33 const char WebRtcTestBase::kAudioVideoCallConstraints360p[] =
34 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " 34 "{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, "
35 " minHeight: 360, maxHeight: 360}}}'"; 35 " minHeight: 360, maxHeight: 360}}}";
36 const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] = 36 const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] =
37 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " 37 "{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, "
38 " minHeight: 480, maxHeight: 480}}}'"; 38 " minHeight: 480, maxHeight: 480}}}";
39 const char WebRtcTestBase::kAudioVideoCallConstraints720p[] = 39 const char WebRtcTestBase::kAudioVideoCallConstraints720p[] =
40 "'{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, " 40 "{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, "
41 " minHeight: 720, maxHeight: 720}}}'"; 41 " minHeight: 720, maxHeight: 720}}}";
42 const char WebRtcTestBase::kAudioVideoCallConstraints1080p[] = 42 const char WebRtcTestBase::kAudioVideoCallConstraints1080p[] =
43 "'{audio: true, video: {mandatory: {minWidth: 1920, maxWidth: 1920, " 43 "{audio: true, video: {mandatory: {minWidth: 1920, maxWidth: 1920, "
44 " minHeight: 1080, maxHeight: 1080}}}'"; 44 " minHeight: 1080, maxHeight: 1080}}}";
45 const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "'{audio: true}'"; 45 const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "{audio: true}";
46 const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "'{video: true}'"; 46 const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "{video: true}";
47 const char WebRtcTestBase::kFailedWithPermissionDeniedError[] = 47 const char WebRtcTestBase::kFailedWithPermissionDeniedError[] =
48 "failed-with-error-PermissionDeniedError"; 48 "failed-with-error-PermissionDeniedError";
49 const char WebRtcTestBase::kFailedWithPermissionDismissedError[] = 49 const char WebRtcTestBase::kFailedWithPermissionDismissedError[] =
50 "failed-with-error-PermissionDismissedError"; 50 "failed-with-error-PermissionDismissedError";
51 51
52 namespace { 52 namespace {
53 53
54 base::LazyInstance<bool> hit_javascript_errors_ = 54 base::LazyInstance<bool> hit_javascript_errors_ =
55 LAZY_INSTANCE_INITIALIZER; 55 LAZY_INSTANCE_INITIALIZER;
56 56
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 return result == "has-video-source"; 353 return result == "has-video-source";
354 } 354 }
355 355
356 bool WebRtcTestBase::OnWinXp() const { 356 bool WebRtcTestBase::OnWinXp() const {
357 #if defined(OS_WIN) 357 #if defined(OS_WIN)
358 return base::win::GetVersion() <= base::win::VERSION_XP; 358 return base::win::GetVersion() <= base::win::VERSION_XP;
359 #else 359 #else
360 return false; 360 return false;
361 #endif 361 #endif
362 } 362 }
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_webrtc_browsertest.cc ('k') | chrome/test/data/webrtc/getusermedia.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698