Merge Widevine CDM-Side Test Changes

This is a combined merge of several small test changes in the
Widevine CDM repository:

http://go/wvgerrit/11252
  Chain CreateSession() Helpers in CDM Session Unit Test

http://go/wvgerrit/10931
  Increase URLRequest timeouts and tolerate 502's.

http://go/wvgerrit/10695
  Remove dead CHROMIUM_BUILD code in engine test.

Change-Id: I75a6c9509880a20c85e54cbd2fcbf34b101ce70e
This commit is contained in:
John "Juce" Bruce
2015-03-04 12:39:06 -08:00
parent 2ae1f717f3
commit 33ddce2298
4 changed files with 10 additions and 16 deletions

View File

@@ -73,8 +73,14 @@ void ConcatenateChunkedResponse(const std::string http_response,
namespace wvcdm {
UrlRequest::UrlRequest(const std::string& url)
: is_connected_(false),
socket_(url) {
: is_connected_(false), socket_(url) {
Reconnect();
}
UrlRequest::~UrlRequest() {}
void UrlRequest::Reconnect() {
socket_.CloseSocket();
if (socket_.Connect(kConnectTimeoutMs)) {
is_connected_ = true;
} else {
@@ -83,8 +89,6 @@ UrlRequest::UrlRequest(const std::string& url)
}
}
UrlRequest::~UrlRequest() {}
bool UrlRequest::GetResponse(std::string* message) {
std::string response;