commit 25ed5800b93a2d6040f4fdfeae64cb3629e3f277
author nisse <nisse@webrtc.org> Mon Apr 11 13:01:27 2016
committer Commit bot <commit-bot@chromium.org> Mon Apr 11 13:01:32 2016
tree 9f593f0350540dc1b027283621d6d977f0dcf89b
parent 3858477d4b751f85cbbcc6aec3570eebe4bf8e55

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

diff --git a/webrtc/api/api_tests.gyp b/webrtc/api/api_tests.gyp
index 7cefd13..e66fa7f 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',

webrtc/api/proxy_unittest.cc

diff --git a/webrtc/api/proxy_unittest.cc b/webrtc/api/proxy_unittest.cc
index 85e5438..2578e9b 100644
--- a/webrtc/api/proxy_unittest.cc
+++ b/webrtc/api/proxy_unittest.cc
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#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"