| Index: third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/RTCErrorCallback.h b/third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
|
| similarity index 78%
|
| copy from third_party/WebKit/Source/modules/mediastream/RTCErrorCallback.h
|
| copy to third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
|
| index 2c018eec6d5732dd646f3c96ae990751209faecb..da5111e8f80c6a760df154d526f9caa59f6fb922 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/RTCErrorCallback.h
|
| +++ b/third_party/WebKit/Source/modules/mediastream/RTCCertificate.cpp
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright (C) 2012 Google Inc. All rights reserved.
|
| + * Copyright (C) 2015 Google Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -28,21 +28,24 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef RTCErrorCallback_h
|
| -#define RTCErrorCallback_h
|
| -
|
| -#include "platform/heap/Handle.h"
|
| -#include "wtf/text/WTFString.h"
|
| +#include "config.h"
|
| +#include "modules/mediastream/RTCCertificate.h"
|
|
|
| namespace blink {
|
|
|
| -class RTCErrorCallback : public GarbageCollectedFinalized<RTCErrorCallback> {
|
| -public:
|
| - virtual ~RTCErrorCallback() { }
|
| - DEFINE_INLINE_VIRTUAL_TRACE() { }
|
| - virtual void handleEvent(const String& errorInformation) = 0;
|
| -};
|
| +double RTCCertificate::expires() const
|
| +{
|
| + return m_certificate->expires();
|
| +}
|
|
|
| -} // namespace blink
|
| +RTCCertificate::RTCCertificate(WebRTCCertificate* certificate)
|
| + : m_certificate(adoptPtr(certificate))
|
| +{
|
| +}
|
|
|
| -#endif // RTCErrorCallback_h
|
| +WebRTCCertificate* RTCCertificate::certificateShallowCopy() const
|
| +{
|
| + return m_certificate->shallowCopy();
|
| +}
|
| +
|
| +} // namespace blink
|
|
|