From 25ed5800b93a2d6040f4fdfeae64cb3629e3f277 Mon Sep 17 00:00:00 2001 From: nisse Date: Mon, 11 Apr 2016 06:01:27 -0700 Subject: [PATCH] Enable proxy_unittest (thread proxy tests). BUG=webrtc:5426 Review URL: https://codereview.webrtc.org/1876773002 Cr-Commit-Position: refs/heads/master@{#12314} --- webrtc/api/api_tests.gyp | 2 +- webrtc/api/proxy_unittest.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/api/api_tests.gyp b/webrtc/api/api_tests.gyp index 7cefd135b6..e66fa7f7d2 100644 --- a/webrtc/api/api_tests.gyp +++ b/webrtc/api/api_tests.gyp @@ -43,7 +43,7 @@ 'peerconnectionendtoend_unittest.cc', 'peerconnectionfactory_unittest.cc', 'peerconnectioninterface_unittest.cc', - # 'peerconnectionproxy_unittest.cc', + 'proxy_unittest.cc', 'rtpsenderreceiver_unittest.cc', 'statscollector_unittest.cc', 'test/fakeaudiocapturemodule.cc', diff --git a/webrtc/api/proxy_unittest.cc b/webrtc/api/proxy_unittest.cc index 85e5438076..2578e9b4b1 100644 --- a/webrtc/api/proxy_unittest.cc +++ b/webrtc/api/proxy_unittest.cc @@ -12,7 +12,7 @@ #include -#include "testing/base/public/gmock.h" +#include "testing/gmock/include/gmock/gmock.h" #include "webrtc/base/gunit.h" #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ptr.h"