EDK: Remove (direct) dependencies of //mojo/edk/system on //base/test.

mojo/edk/system/endpoint_relayer_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/edk/system/endpoint_relayer.h"
 
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
-#include "base/test/test_timeouts.h"
+#include "base/time/time.h"
 #include "mojo/edk/system/channel_endpoint_id.h"
 #include "mojo/edk/system/channel_test_base.h"
 #include "mojo/edk/system/message_in_transit_queue.h"
 #include "mojo/edk/system/message_in_transit_test_utils.h"
 #include "mojo/edk/system/ref_ptr.h"
+#include "mojo/edk/system/test/timeouts.h"
 #include "mojo/edk/system/test_channel_endpoint_client.h"
 #include "mojo/edk/util/make_unique.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 namespace {
 
 class EndpointRelayerTest : public test::ChannelTestBase {
  public:
@@ skipping 64 matching lines @@
   MOJO_DISALLOW_COPY_AND_ASSIGN(EndpointRelayerTest);
 };
 
 TEST_F(EndpointRelayerTest, Basic) {
   base::WaitableEvent read_event(true, false);
   client1b()->SetReadEvent(&read_event);
   EXPECT_EQ(0u, client1b()->NumMessages());
 
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(12345)));
 
-  EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
+  EXPECT_TRUE(read_event.TimedWait(base::TimeDelta::FromMicroseconds(
+      static_cast<int64_t>(test::TinyTimeout()))));
   client1b()->SetReadEvent(nullptr);
 
   ASSERT_EQ(1u, client1b()->NumMessages());
   std::unique_ptr<MessageInTransit> read_message = client1b()->PopMessage();
   ASSERT_TRUE(read_message);
   test::VerifyTestMessage(read_message.get(), 12345);
 
   // Now do the same thing in the opposite direction.
   read_event.Reset();
   client1a()->SetReadEvent(&read_event);
   EXPECT_EQ(0u, client1a()->NumMessages());
 
   EXPECT_TRUE(endpoint1b()->EnqueueMessage(test::MakeTestMessage(67890)));
 
-  EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
+  EXPECT_TRUE(read_event.TimedWait(base::TimeDelta::FromMicroseconds(
+      static_cast<int64_t>(test::TinyTimeout()))));
   client1a()->SetReadEvent(nullptr);
 
   ASSERT_EQ(1u, client1a()->NumMessages());
   read_message = client1a()->PopMessage();
   ASSERT_TRUE(read_message);
   test::VerifyTestMessage(read_message.get(), 67890);
 }
 
 TEST_F(EndpointRelayerTest, MultipleMessages) {
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(2)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(3)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(4)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(5)));
 
   base::WaitableEvent read_event(true, false);
   client1b()->SetReadEvent(&read_event);
   for (size_t i = 0; client1b()->NumMessages() < 5 && i < 5; i++) {
-    EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
+    EXPECT_TRUE(read_event.TimedWait(base::TimeDelta::FromMicroseconds(
+        static_cast<int64_t>(test::TinyTimeout()))));
     read_event.Reset();
   }
   client1b()->SetReadEvent(nullptr);
 
   // Check the received messages.
   ASSERT_EQ(5u, client1b()->NumMessages());
   for (unsigned message_id = 1; message_id <= 5; message_id++) {
     std::unique_ptr<MessageInTransit> read_message = client1b()->PopMessage();
     ASSERT_TRUE(read_message);
     test::VerifyTestMessage(read_message.get(), message_id);
@@ skipping 50 matching lines @@
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1001)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(3)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(4)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1002)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(1003)));
   EXPECT_TRUE(endpoint1a()->EnqueueMessage(test::MakeTestMessage(5)));
 
   base::WaitableEvent read_event(true, false);
   client1b()->SetReadEvent(&read_event);
   for (size_t i = 0; client1b()->NumMessages() < 5 && i < 5; i++) {
-    EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
+    EXPECT_TRUE(read_event.TimedWait(base::TimeDelta::FromMicroseconds(
+        static_cast<int64_t>(test::TinyTimeout()))));
     read_event.Reset();
   }
   client1b()->SetReadEvent(nullptr);
 
   // Check the received messages: We should get "1"-"5".
   ASSERT_EQ(5u, client1b()->NumMessages());
   for (unsigned message_id = 1; message_id <= 5; message_id++) {
     std::unique_ptr<MessageInTransit> read_message = client1b()->PopMessage();
     ASSERT_TRUE(read_message);
     test::VerifyTestMessage(read_message.get(), message_id);
@@ skipping 10 matching lines @@
     ASSERT_TRUE(message);
     test::VerifyTestMessage(message.get(), message_id);
   }
 }
 
 // TODO(vtl): Add some "shutdown" tests.
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo