| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import platform | 6 import platform |
| 7 | 7 |
| 8 import pyauto_functional | 8 import pyauto_functional |
| 9 import webrtc_test_base | 9 import webrtc_test_base |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 self.CloseTab(tab_index=0) | 58 self.CloseTab(tab_index=0) |
| 59 | 59 |
| 60 def testSuccessfulGetUserMediaAndThenClose(self): | 60 def testSuccessfulGetUserMediaAndThenClose(self): |
| 61 """Waits for WebRTC to respond, and closes the tab.""" | 61 """Waits for WebRTC to respond, and closes the tab.""" |
| 62 self.LoadTestPageInOneTab() | 62 self.LoadTestPageInOneTab() |
| 63 self.GetUserMedia(tab_index=0, action='accept') | 63 self.GetUserMedia(tab_index=0, action='accept') |
| 64 self.CloseTab(tab_index=0) | 64 self.CloseTab(tab_index=0) |
| 65 | 65 |
| 66 def _GetUserMediaWithoutTakingAction(self, tab_index): | 66 def _GetUserMediaWithoutTakingAction(self, tab_index): |
| 67 self.assertEquals('ok-requested', self.ExecuteJavascript( | 67 self.assertEquals('ok-requested', self.ExecuteJavascript( |
| 68 'getUserMedia("{ audio: true, video: true, }")', tab_index=0)) | 68 'doGetUserMedia("{ audio: true, video: true, }")', tab_index=0)) |
| 69 | 69 |
| 70 | 70 |
| 71 if __name__ == '__main__': | 71 if __name__ == '__main__': |
| 72 pyauto_functional.Main() | 72 pyauto_functional.Main() |
| OLD | NEW |