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

Side by Side Diff: chrome/browser/media/webrtc/webrtc_browsertest_base.h

Issue 2334223012: Fix failures on content_browser tests on Windows 7. (Closed)
Patch Set: don't use the webrtc sendToTest method, and compare to 'video-input' (and not 'video') Created 4 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/webrtc_browsertest_base.cc » ('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 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_BROWSERTEST_BASE_H_ 5 #ifndef CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_BROWSERTEST_BASE_H_
6 #define CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_BROWSERTEST_BASE_H_ 6 #define CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_BROWSERTEST_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // chrome/test/data/webrtc/video_detector.js and its dependencies loaded to 144 // chrome/test/data/webrtc/video_detector.js and its dependencies loaded to
145 // make that work). Looks at a 320x240 area of the target video tag. 145 // make that work). Looks at a 320x240 area of the target video tag.
146 void StartDetectingVideo(content::WebContents* tab_contents, 146 void StartDetectingVideo(content::WebContents* tab_contents,
147 const std::string& video_element) const; 147 const std::string& video_element) const;
148 bool WaitForVideoToPlay(content::WebContents* tab_contents) const; 148 bool WaitForVideoToPlay(content::WebContents* tab_contents) const;
149 149
150 // Returns the stream size as a string on the format <width>x<height>. 150 // Returns the stream size as a string on the format <width>x<height>.
151 std::string GetStreamSize(content::WebContents* tab_contents, 151 std::string GetStreamSize(content::WebContents* tab_contents,
152 const std::string& video_element) const; 152 const std::string& video_element) const;
153 153
154 // Methods to check what devices we have on the system.
155 bool HasWebcamAvailableOnSystem(content::WebContents* tab_contents) const;
156
157 // Returns true if we're on win 8. 154 // Returns true if we're on win 8.
158 bool OnWin8() const; 155 bool OnWin8() const;
159 156
160 void OpenDatabase(content::WebContents* tab) const; 157 void OpenDatabase(content::WebContents* tab) const;
161 void CloseDatabase(content::WebContents* tab) const; 158 void CloseDatabase(content::WebContents* tab) const;
162 void DeleteDatabase(content::WebContents* tab) const; 159 void DeleteDatabase(content::WebContents* tab) const;
163 160
164 void GenerateAndCloneCertificate(content::WebContents* tab, 161 void GenerateAndCloneCertificate(content::WebContents* tab,
165 const std::string& keygen_algorithm) const; 162 const std::string& keygen_algorithm) const;
166 163
(...skipping 21 matching lines...) Expand all
188 infobars::InfoBar* GetUserMediaAndWaitForInfoBar( 185 infobars::InfoBar* GetUserMediaAndWaitForInfoBar(
189 content::WebContents* tab_contents, 186 content::WebContents* tab_contents,
190 const std::string& constraints) const; 187 const std::string& constraints) const;
191 188
192 bool detect_errors_in_javascript_; 189 bool detect_errors_in_javascript_;
193 190
194 DISALLOW_COPY_AND_ASSIGN(WebRtcTestBase); 191 DISALLOW_COPY_AND_ASSIGN(WebRtcTestBase);
195 }; 192 };
196 193
197 #endif // CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_BROWSERTEST_BASE_H_ 194 #endif // CHROME_BROWSER_MEDIA_WEBRTC_WEBRTC_BROWSERTEST_BASE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/webrtc/webrtc_browsertest_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698