From 33ddce2298e1b6ffcb0274bff8f9e6402d4c9b5d Mon Sep 17 00:00:00 2001
From: "John \"Juce\" Bruce" <juce@google.com>
Date: Wed, 4 Mar 2015 12:39:06 -0800
Subject: [PATCH] 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
---
 libwvdrmengine/cdm/core/test/cdm_engine_test.cpp     |  8 --------
 .../cdm/core/test/cdm_session_unittest.cpp           |  5 +----
 libwvdrmengine/cdm/core/test/url_request.cpp         | 12 ++++++++----
 libwvdrmengine/cdm/core/test/url_request.h           |  1 +
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
index 12997709..380fe919 100644
--- a/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
+++ b/libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
@@ -9,10 +9,6 @@
 
 #include <string>
 
-#if defined(CHROMIUM_BUILD)
-#include "base/at_exit.h"
-#include "base/message_loop/message_loop.h"
-#endif
 #include "cdm_engine.h"
 #include "config_test_env.h"
 #include "gtest/gtest.h"
@@ -300,9 +296,5 @@ int main(int argc, char **argv) {
                                       g_key_id_pssh);
   g_key_id_unwrapped = extractor.data();
 
-#if defined(CHROMIUM_BUILD)
-  base::AtExitManager exit;
-  base::MessageLoop ttr(base::MessageLoop::TYPE_IO);
-#endif
   return RUN_ALL_TESTS();
 }
diff --git a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
index 58304e22..c940c52a 100644
--- a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
@@ -135,10 +135,7 @@ class CdmSessionTest : public ::testing::Test {
     if (cdm_session_) delete cdm_session_;
   }
 
-  void CreateSession() {
-    cdm_session_ = new CdmSession(license_parser_, crypto_session_,
-                                  policy_engine_, file_handle_, NULL);
-  }
+  void CreateSession() { CreateSession(NULL); }
 
   void CreateSession(const CdmClientPropertySet* cdm_client_property_set) {
     cdm_session_ =
diff --git a/libwvdrmengine/cdm/core/test/url_request.cpp b/libwvdrmengine/cdm/core/test/url_request.cpp
index 92f8df7e..13503468 100644
--- a/libwvdrmengine/cdm/core/test/url_request.cpp
+++ b/libwvdrmengine/cdm/core/test/url_request.cpp
@@ -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;
 
diff --git a/libwvdrmengine/cdm/core/test/url_request.h b/libwvdrmengine/cdm/core/test/url_request.h
index 498bb624..5cbabf99 100644
--- a/libwvdrmengine/cdm/core/test/url_request.h
+++ b/libwvdrmengine/cdm/core/test/url_request.h
@@ -17,6 +17,7 @@ class UrlRequest {
   ~UrlRequest();
 
   bool is_connected() const { return is_connected_; }
+  void Reconnect();
 
   bool PostRequest(const std::string& data);
   bool PostCertRequestInQueryString(const std::string& data);