| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 #include "public/platform/WebMediaConstraints.h" | 34 #include "public/platform/WebMediaConstraints.h" |
| 35 #include "public/platform/WebMediaStream.h" | 35 #include "public/platform/WebMediaStream.h" |
| 36 #include "public/platform/WebMediaStreamSource.h" | 36 #include "public/platform/WebMediaStreamSource.h" |
| 37 #include "public/platform/WebMediaStreamTrack.h" | 37 #include "public/platform/WebMediaStreamTrack.h" |
| 38 #include "public/platform/WebVector.h" | 38 #include "public/platform/WebVector.h" |
| 39 #include "public/testing/WebTestDelegate.h" | 39 #include "public/testing/WebTestDelegate.h" |
| 40 #include "public/web/WebDocument.h" | 40 #include "public/web/WebDocument.h" |
| 41 #include "public/web/WebMediaStreamRegistry.h" | 41 #include "public/web/WebMediaStreamRegistry.h" |
| 42 #include "public/web/WebUserMediaRequest.h" | 42 #include "public/web/WebUserMediaRequest.h" |
| 43 | 43 |
| 44 using namespace WebKit; | 44 using namespace blink; |
| 45 | 45 |
| 46 namespace WebTestRunner { | 46 namespace WebTestRunner { |
| 47 | 47 |
| 48 class UserMediaRequestTask : public WebMethodTask<WebUserMediaClientMock> { | 48 class UserMediaRequestTask : public WebMethodTask<WebUserMediaClientMock> { |
| 49 public: | 49 public: |
| 50 UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaReque
st& request, const WebMediaStream result) | 50 UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaReque
st& request, const WebMediaStream result) |
| 51 : WebMethodTask<WebUserMediaClientMock>(object) | 51 : WebMethodTask<WebUserMediaClientMock>(object) |
| 52 , m_request(request) | 52 , m_request(request) |
| 53 , m_result(result) | 53 , m_result(result) |
| 54 { | 54 { |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 stream.setExtraData(new MockExtraData()); | 158 stream.setExtraData(new MockExtraData()); |
| 159 | 159 |
| 160 m_delegate->postTask(new UserMediaRequestTask(this, request, stream)); | 160 m_delegate->postTask(new UserMediaRequestTask(this, request, stream)); |
| 161 } | 161 } |
| 162 | 162 |
| 163 void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&) | 163 void WebUserMediaClientMock::cancelUserMediaRequest(const WebUserMediaRequest&) |
| 164 { | 164 { |
| 165 } | 165 } |
| 166 | 166 |
| 167 } | 167 } |
| OLD | NEW |