Chromium Code Reviews| Index: Source/wtf/tests/RunAllTests.cpp |
| diff --git a/Source/core/loader/UniqueIdentifier.cpp b/Source/wtf/tests/RunAllTests.cpp |
| similarity index 81% |
| copy from Source/core/loader/UniqueIdentifier.cpp |
| copy to Source/wtf/tests/RunAllTests.cpp |
| index 0ad56563e3e214a67acd8c53decb085ad4250cb9..dbe086fd6b693f7bb87aca7a160e1b8b04b5aba9 100644 |
| --- a/Source/core/loader/UniqueIdentifier.cpp |
| +++ b/Source/wtf/tests/RunAllTests.cpp |
| @@ -28,17 +28,21 @@ |
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| -#include "config.h" |
| -#include "core/loader/UniqueIdentifier.h" |
| +#include "wtf/CurrentTime.h" |
| +#include "wtf/MainThread.h" |
| +#include "wtf/Threading.h" |
| +#include <gmock/gmock.h> |
| +#include <gtest/gtest.h> |
| -namespace WebCore { |
| - |
| -static unsigned long s_uniqueIdentifier = 0; |
| - |
| -unsigned long createUniqueIdentifier() |
| +static double CurrentTime() |
| { |
| - return ++s_uniqueIdentifier; |
| + return 0.0; |
| } |
| -} // namespace WebCore |
| - |
| +int main(int argc, char** argv) |
| +{ |
| + ::testing::InitGoogleMock(&argc, argv); |
| + WTF::initialize(CurrentTime, 0); |
| + WTF::initializeMainThread(0); |
|
abarth-chromium
2013/05/28 06:28:24
It would be better if these calls were combined...
|
| + return RUN_ALL_TESTS(); |
| +} |