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

webrtc/base/linux.cc

 /*
  *  Copyright 2008 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 215 matching lines @@
   pos = 0;
   while (pos < tokens[1].length() && isspace(tokens[1][pos])) {
     pos++;
   }
   tokens[1].erase(0, pos);
   *key = tokens[0];
   *value = tokens[1];
   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) {
     LOG_ERR(LS_ERROR) << "Can't call uname()";
     return std::string();
   }
   std::ostringstream sstr;
   sstr << buf.sysname << " "
        << buf.release << " "
        << buf.version << " "
        << buf.machine;
   return sstr.str();
 }
 
 int ReadCpuMaxFreq() {
   FileStream fs;
   std::string str;
   int freq = -1;
   if (!fs.Open(kCpuMaxFreqFile, "r", NULL) ||
       SR_SUCCESS != fs.ReadLine(&str) ||
       !FromString(str, &freq)) {
     return -1;
   }
   return freq;
 }
 
 }  // namespace rtc
 
 #endif  // defined(WEBRTC_LINUX)