[ChromeDriver] Add tests from chromedriver_tests to chromedriver_unittests

Change-Id: I73234122c72b45b68b1d42e1d32a56f6f46b8f37
Reviewed-on: https://chromium-review.googlesource.com/c/1454905
Commit-Queue: Tatiana Buldina <buldina@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629760}

chrome/test/chromedriver/BUILD.gn

@@ -413,10 +413,17 @@ test("chromedriver_unittests") {
     "chrome_launcher_unittest.cc",
     "command_listener_proxy_unittest.cc",
     "commands_unittest.cc",
+    "key_converter_unittest.cc",
+    "keycode_text_conversion_unittest.cc",
     "log_replay/devtools_log_reader_unittest.cc",
     "logging_unittest.cc",
     "net/adb_client_socket_unittest.cc",
+    "net/net_util_unittest.cc",
+    "net/sync_websocket_impl_unittest.cc",
+    "net/test_http_server.cc",
+    "net/test_http_server.h",
     "net/timeout_unittest.cc",
+    "net/websocket_unittest.cc",
     "performance_logger_unittest.cc",
     "server/http_handler_unittest.cc",
     "session_commands_unittest.cc",
@@ -437,15 +444,19 @@ test("chromedriver_unittests") {
     ":lib",
     "//base",
     "//base/test:run_all_unittests",
+    "//mojo/core/embedder",
     "//net",
     "//net:test_support",
     "//net/server:http_server",
+    "//services/network/public/cpp",
     "//services/network/public/mojom",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/base",
+    "//ui/events:test_support",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//url",
   ]
 }
 

chrome/test/chromedriver/keycode_text_conversion_unittest.cc

@@ -136,7 +136,7 @@ TEST(KeycodeTextConversionTest, MAYBE_NonShiftModifiers) {
 #endif
 }
 
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MACOSX)
 // Not implemented on Linux.
 // Fails if tested layouts are not installed on Mac.
 #define MAYBE_NonEnglish DISABLED_NonEnglish

chrome/test/chromedriver/net/net_util_unittest.cc

@@ -140,28 +140,36 @@ class FetchUrlTest : public testing::Test,
 
 }  // namespace
 
+#if !defined(THREAD_SANITIZER)
 TEST_F(FetchUrlTest, Http200) {
   std::string response("stuff");
   ASSERT_TRUE(DoFetchURL(server_url_, &response));
   ASSERT_STREQ("hello", response.c_str());
 }
+#endif
 
+#if !defined(THREAD_SANITIZER)
 TEST_F(FetchUrlTest, HttpNon200) {
   response_ = kSend404;
   std::string response("stuff");
   ASSERT_FALSE(DoFetchURL(server_url_, &response));
   ASSERT_STREQ("stuff", response.c_str());
 }
+#endif
 
+#if !defined(THREAD_SANITIZER)
 TEST_F(FetchUrlTest, ConnectionClose) {
   response_ = kClose;
   std::string response("stuff");
   ASSERT_FALSE(DoFetchURL(server_url_, &response));
   ASSERT_STREQ("stuff", response.c_str());
 }
+#endif
 
+#if !defined(THREAD_SANITIZER)
 TEST_F(FetchUrlTest, NoServer) {
   std::string response("stuff");
   ASSERT_FALSE(DoFetchURL("http://localhost:33333", &response));
   ASSERT_STREQ("stuff", response.c_str());
 }
+#endif

chrome/test/chromedriver/net/websocket_unittest.cc

@@ -189,18 +189,23 @@ TEST_F(WebSocketTest, CloseOnSend) {
   ASSERT_FALSE(sock->Send("hi"));
 }
 
+#if !DCHECK_IS_ON()
 TEST_F(WebSocketTest, SendReceive) {
   std::vector<std::string> messages;
   messages.push_back("hello");
   SendReceive(messages);
 }
+#endif
 
+#if !DCHECK_IS_ON()
 TEST_F(WebSocketTest, SendReceiveLarge) {
   std::vector<std::string> messages;
   messages.push_back(std::string(10 << 20, 'a'));
   SendReceive(messages);
 }
+#endif
 
+#if !DCHECK_IS_ON()
 TEST_F(WebSocketTest, SendReceiveManyPacks) {
   std::vector<std::string> messages;
   // A message size of 1 << 16 crashes code with https://crbug.com/877105 bug
@@ -210,7 +215,9 @@ TEST_F(WebSocketTest, SendReceiveManyPacks) {
   SetReadBufferSize(1);
   SendReceive(messages);
 }
+#endif
 
+#if !DCHECK_IS_ON()
 TEST_F(WebSocketTest, SendReceiveMultiple) {
   std::vector<std::string> messages;
   messages.push_back("1");
@@ -218,3 +225,4 @@ TEST_F(WebSocketTest, SendReceiveMultiple) {
   messages.push_back("3");
   SendReceive(messages);
 }
+#endif