Don't rely on webrtc/base/scoped_ptr.h to include stuff for you
webrtc/base/scoped_ptr.h doesn't need to include webrtc/base/common.h anymore, but a couple of its users were relying on it to pull in other things for them. Fix that, and remove the now really unnecessary webrtc/base/common.h include. R=andrew@webrtc.org, pthatcher@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37169004 Cr-Commit-Position: refs/heads/master@{#8333} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8333 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -155,7 +155,7 @@ void ProcessCallAfterAFewMs(int64_t milliseconds) {
|
||||
// thereof), can make the test run in "0"ms time.
|
||||
EXPECT_GE(called_time, start_time);
|
||||
// Check for an acceptable range.
|
||||
uint32 diff = called_time - start_time;
|
||||
uint32_t diff = called_time - start_time;
|
||||
EXPECT_GE(diff, milliseconds - 15);
|
||||
EXPECT_LT(diff, milliseconds + 15);
|
||||
}
|
||||
@ -247,7 +247,7 @@ TEST(ProcessThreadImpl, WakeUp) {
|
||||
ASSERT_GT(start_time, 0);
|
||||
ASSERT_GT(called_time, 0);
|
||||
EXPECT_GE(called_time, start_time);
|
||||
uint32 diff = called_time - start_time;
|
||||
uint32_t diff = called_time - start_time;
|
||||
// We should have been called back much quicker than 1sec.
|
||||
EXPECT_LE(diff, 100u);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user