Merge 174913

remoting/host/linux/audio_pipe_reader.cc

 // Copyright (c) 2012 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 "remoting/host/linux/audio_pipe_reader.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ skipping 127 matching lines @@
   int64 bytes_to_read = stream_position_bytes - last_capture_position_;
 
   std::string data = left_over_bytes_;
   size_t pos = data.size();
   left_over_bytes_.clear();
   data.resize(pos + bytes_to_read);
 
   while (pos < data.size()) {
     int read_result = HANDLE_EINTR(
        read(pipe_fd_, string_as_array(&data) + pos, data.size() - pos));
-    if (read_result >= 0) {
+    if (read_result > 0) {
       pos += read_result;
     } else {
-      if (errno != EWOULDBLOCK && errno != EAGAIN)
+      if (read_result < 0 && errno != EWOULDBLOCK && errno != EAGAIN)
         PLOG(ERROR) << "read";
       break;
     }
   }
 
   // Stop reading from the pipe if PulseAudio isn't writing anything.
   if (pos == 0) {
     WaitForPipeReadable();
     return;
   }
@@ skipping 29 matching lines @@
       pipe_fd_, false, MessageLoopForIO::WATCH_READ,
       &file_descriptor_watcher_, this);
 }
 
 // static
 void AudioPipeReaderTraits::Destruct(const AudioPipeReader* audio_pipe_reader) {
   audio_pipe_reader->task_runner_->DeleteSoon(FROM_HERE, audio_pipe_reader);
 }
 
 }  // namespace remoting