From 511dce1fa056c4ff9ef95839fb5b7ecd30b35461 Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Tue, 15 Jul 2014 12:53:22 -0700 Subject: [PATCH] Source release v2.1.7-0-827 + third_party libs Change-Id: I9f5f3082ec3fc5f535a724a2c26989831c3cf515 --- cdm/include/wv_cdm_version.h | 2 +- core/test/cdm_engine_test.cpp | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/cdm/include/wv_cdm_version.h b/cdm/include/wv_cdm_version.h index a16297ab..f721e3ce 100644 --- a/cdm/include/wv_cdm_version.h +++ b/cdm/include/wv_cdm_version.h @@ -1,3 +1,3 @@ // Widevine CDM Kit Version - #define WV_CDM_VERSION "v2.1.6-0-824" + #define WV_CDM_VERSION "v2.1.7-0-827" diff --git a/core/test/cdm_engine_test.cpp b/core/test/cdm_engine_test.cpp index 3ee128b6..7df771b3 100644 --- a/core/test/cdm_engine_test.cpp +++ b/core/test/cdm_engine_test.cpp @@ -5,10 +5,6 @@ #include -#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" @@ -324,9 +320,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(); }