projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
webrtc
/
base
/
cpumonitor_unittest.cc
diff --git
a/src/third_party/webrtc/base/cpumonitor_unittest.cc
b/src/third_party/webrtc/base/cpumonitor_unittest.cc
index
1546f55
..
379f62f
100644
(file)
--- a/
src/third_party/webrtc/base/cpumonitor_unittest.cc
+++ b/
src/third_party/webrtc/base/cpumonitor_unittest.cc
@@
-338,7
+338,7
@@
TEST(CpuMonitorTest, TestGetSystemLoadForceFallback) {
#endif
// Tests both process and system functions in use at same time.
-TEST(CpuMonitorTest,
DISABLED_ON_MAC(TestGetBothLoad)
) {
+TEST(CpuMonitorTest,
TestGetBothLoad
) {
TestCpuSampler(true, true, false);
}