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

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

Issue 294053002: Split regular and perf WebRTC browser tests, remove CPU test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing js files that accidentally got uploaded 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
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_base.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
24 // For fine-grained suppression.
25 #include "base/win/windows_version.h"
26 #endif
27
23 const char WebRtcTestBase::kAudioVideoCallConstraints[] = 28 const char WebRtcTestBase::kAudioVideoCallConstraints[] =
24 "'{audio: true, video: true}'"; 29 "'{audio: true, video: true}'";
25 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] = 30 const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] =
26 "'{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, " 31 "'{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, "
27 " minHeight: 240, maxHeight: 240}}}'"; 32 " minHeight: 240, maxHeight: 240}}}'";
28 const char WebRtcTestBase::kAudioVideoCallConstraints360p[] = 33 const char WebRtcTestBase::kAudioVideoCallConstraints360p[] =
29 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " 34 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, "
30 " minHeight: 360, maxHeight: 360}}}'"; 35 " minHeight: 360, maxHeight: 360}}}'";
31 const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] = 36 const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] =
32 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " 37 "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, "
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 EXPECT_TRUE(StartsWithASCII(result, "ok-", true)); 345 EXPECT_TRUE(StartsWithASCII(result, "ok-", true));
341 return result.substr(3); 346 return result.substr(3);
342 } 347 }
343 348
344 bool WebRtcTestBase::HasWebcamAvailableOnSystem( 349 bool WebRtcTestBase::HasWebcamAvailableOnSystem(
345 content::WebContents* tab_contents) const { 350 content::WebContents* tab_contents) const {
346 std::string result = 351 std::string result =
347 ExecuteJavascript("HasVideoSourceOnSystem();", tab_contents); 352 ExecuteJavascript("HasVideoSourceOnSystem();", tab_contents);
348 return result == "has-video-source"; 353 return result == "has-video-source";
349 } 354 }
355
356 bool WebRtcTestBase::OnWinXp() const {
357 #if defined(OS_WIN)
358 return base::win::GetVersion() <= base::win::VERSION_XP;
359 #else
360 return false;
361 #endif
362 }
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc_browsertest_base.h ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698