Roll chromium_revision d66326c..4df108a (367167:367307)

webrtc/base/linux.cc

Index: webrtc/base/linux.cc
diff --git a/webrtc/base/linux.cc b/webrtc/base/linux.cc
index 1586b27b07eac8bd54e2f1f90fabb12a057f1680..0894d39c7716a50c5e20b1f75aef80ac25922a86 100644
--- a/webrtc/base/linux.cc
+++ b/webrtc/base/linux.cc
@@ -233,33 +233,6 @@ bool ConfigParser::ParseLine(std::string* key, std::string* value) {
   return true;
 }
 
-#if !defined(WEBRTC_CHROMIUM_BUILD)

[kjellander_webrtc, 2016/01/04 15:17:03]

dead code.

-static bool ExpectLineFromStream(FileStream* stream,
-                                 std::string* out) {
-  StreamResult res = stream->ReadLine(out);
-  if (res != SR_SUCCESS) {
-    if (res != SR_EOS) {
-      LOG(LS_ERROR) << "Error when reading from stream";
-    } else {
-      LOG(LS_ERROR) << "Incorrect number of lines in stream";
-    }
-    return false;
-  }
-  return true;
-}
-
-static void ExpectEofFromStream(FileStream* stream) {
-  std::string unused;
-  StreamResult res = stream->ReadLine(&unused);
-  if (res == SR_SUCCESS) {
-    LOG(LS_WARNING) << "Ignoring unexpected extra lines from stream";
-  } else if (res != SR_EOS) {
-    LOG(LS_WARNING) << "Error when checking for extra lines from stream";
-  }
-}
-
-#endif
-
 std::string ReadLinuxUname() {
   struct utsname buf;
   if (uname(&buf) < 0) {