We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. Alternative solutions: * Check if we already have defined e.g. CHECK, and don't define them in that case. This makes us depend on include order in Chromium, which is not acceptable. * Don't allow using the macros in WebRTC headers. Error prone since if someone adds it there by mistake it may compile fine, but later break if a header in added or order is changed in Chromium. That will be confusing and hard to enforce. * Ensure that headers that are included by an embedder don't include our macros. This would require some heavy refactoring to be maintainable and enforcable. * Changes in Chromium for this is obviously not an option. BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1335923002 Cr-Commit-Position: refs/heads/master@{#9964}
45 lines
1.2 KiB
C++
45 lines
1.2 KiB
C++
/*
|
|
* Copyright 2015 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/rtccertificate.h"
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/timeutils.h"
|
|
|
|
namespace rtc {
|
|
|
|
scoped_refptr<RTCCertificate> RTCCertificate::Create(
|
|
scoped_ptr<SSLIdentity> identity) {
|
|
return new RefCountedObject<RTCCertificate>(identity.release());
|
|
}
|
|
|
|
RTCCertificate::RTCCertificate(SSLIdentity* identity)
|
|
: identity_(identity) {
|
|
RTC_DCHECK(identity_);
|
|
}
|
|
|
|
RTCCertificate::~RTCCertificate() {
|
|
}
|
|
|
|
uint64 RTCCertificate::expires_timestamp_ns() const {
|
|
// TODO(hbos): Update once SSLIdentity/SSLCertificate supports expires field.
|
|
return 0;
|
|
}
|
|
|
|
bool RTCCertificate::HasExpired() const {
|
|
return expires_timestamp_ns() <= TimeNanos();
|
|
}
|
|
|
|
const SSLCertificate& RTCCertificate::ssl_certificate() const {
|
|
return identity_->certificate();
|
|
}
|
|
|
|
} // namespace rtc
|