| Index: talk/media/base/videoadapter_unittest.cc
|
| diff --git a/talk/media/base/videoadapter_unittest.cc b/talk/media/base/videoadapter_unittest.cc
|
| old mode 100755
|
| new mode 100644
|
| index 7163c4239597590bafc1df01353c1c69d0aabcb3..a8d243ecde74b9dc730c9fa13f253a58ec6727b9
|
| --- a/talk/media/base/videoadapter_unittest.cc
|
| +++ b/talk/media/base/videoadapter_unittest.cc
|
| @@ -42,8 +42,8 @@
|
| namespace cricket {
|
|
|
| namespace {
|
| - static const uint32 kWaitTimeout = 3000U; // 3 seconds.
|
| - static const uint32 kShortWaitTimeout = 1000U; // 1 second.
|
| +static const uint32_t kWaitTimeout = 3000U; // 3 seconds.
|
| +static const uint32_t kShortWaitTimeout = 1000U; // 1 second.
|
| void UpdateCpuLoad(CoordinatedVideoAdapter* adapter,
|
| int current_cpus, int max_cpus, float process_load, float system_load) {
|
| adapter->set_cpu_load_min_samples(1);
|
|
|