Reverting until bots clear up.

runtime/bin/file_system_watcher_linux.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #if !defined(DART_IO_DISABLED)
 
 #include "platform/globals.h"
 #if defined(HOST_OS_LINUX)
 
 #include "bin/file_system_watcher.h"
@@ skipping 92 matching lines @@
   }
   return mask;
 }
 
 
 Dart_Handle FileSystemWatcher::ReadEvents(intptr_t id, intptr_t path_id) {
   USE(path_id);
   const intptr_t kEventSize = sizeof(struct inotify_event);
   const intptr_t kBufferSize = kEventSize + NAME_MAX + 1;
   uint8_t buffer[kBufferSize];
-  intptr_t bytes = SocketBase::Read(id, buffer, kBufferSize);
+  intptr_t bytes = Socket::Read(id, buffer, kBufferSize);
   if (bytes < 0) {
     return DartUtils::NewDartOSError();
   }
   const intptr_t kMaxCount = bytes / kEventSize;
   Dart_Handle events = Dart_NewList(kMaxCount);
   intptr_t offset = 0;
   intptr_t i = 0;
   while (offset < bytes) {
     struct inotify_event* e =
         reinterpret_cast<struct inotify_event*>(buffer + offset);
@@ skipping 19 matching lines @@
   ASSERT(offset == bytes);
   return events;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(HOST_OS_LINUX)
 
 #endif  // !defined(DART_IO_DISABLED)