Further cleanup in PluginStream.

webkit/plugins/npapi/plugin_stream.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.
 
 // TODO : Support NP_ASFILEONLY mode
 // TODO : Support NP_SEEK mode
 // TODO : Support SEEKABLE=true in NewStream
 
 #include "webkit/plugins/npapi/plugin_stream.h"
 
@@ skipping 91 matching lines @@
     return false;
   }
 
   opened_ = true;
 
   if (requested_plugin_mode_ == NP_SEEK) {
     seekable_stream_ = true;
   }
   // If the plugin has requested certain modes, then we need a copy
   // of this file on disk.  Open it and save it as we go.
-  if (requested_plugin_mode_ == NP_ASFILEONLY ||
-      requested_plugin_mode_ == NP_ASFILE) {
+  if (RequestedPluginModeIsAsFile()) {
     if (OpenTempFile() == false) {
       return false;
     }
   }
 
   mime_type_ = char_mime_type;
   return true;
 }
 
 int PluginStream::Write(const char* buffer, const int length,
@@ skipping 10 matching lines @@
       WriteToPlugin(buffer, length, data_offset)) {
     return length;
   }
 
   return -1;
 }
 
 bool PluginStream::WriteToFile(const char* buf, size_t length) {
   // For ASFILEONLY, ASFILE, and SEEK modes, we need to write
   // to the disk
-  if (TempFileIsValid() &&
-      (requested_plugin_mode_ == NP_ASFILE ||
-       requested_plugin_mode_ == NP_ASFILEONLY) ) {
+  if (TempFileIsValid() && RequestedPluginModeIsAsFile()) {
     size_t totalBytesWritten = 0, bytes;
     do {
       bytes = WriteBytes(buf, length);
       totalBytesWritten += bytes;
     } while (bytes > 0U && totalBytesWritten < length);
 
-    if (totalBytesWritten != length)
+    if (totalBytesWritten != length) {
       return false;
+    }
   }
 
   return true;
 }
 
 bool PluginStream::WriteToPlugin(const char* buf, const int length,
                                  const int data_offset) {
   // For NORMAL and ASFILE modes, we send the data to the plugin now
   if (requested_plugin_mode_ != NP_NORMAL &&
       requested_plugin_mode_ != NP_ASFILE &&
@@ skipping 19 matching lines @@
   return true;
 }
 
 void PluginStream::OnDelayDelivery() {
   // It is possible that the plugin stream may have closed before the task
   // was hit.
   if (!opened_)
     return;
 
   int size = static_cast<int>(delivery_data_.size());
-  int written = TryWriteToPlugin(&delivery_data_.front(), size,
-                                 data_offset_);
+  int written = TryWriteToPlugin(&delivery_data_.front(), size, data_offset_);
   if (written > 0) {
     // Remove the data that we already wrote.
     delivery_data_.erase(delivery_data_.begin(),
                          delivery_data_.begin() + written);
   }
 }
 
 int PluginStream::TryWriteToPlugin(const char* buf, const int length,
                                    const int data_offset) {
   int byte_offset = 0;
@@ skipping 74 matching lines @@
   return NULL;
 }
 
 void PluginStream::Notify(NPReason reason) {
   if (notify_needed_) {
     instance_->NPP_URLNotify(stream_.url, reason, notify_data_);
     notify_needed_ = false;
   }
 }
 
+bool PluginStream::RequestedPluginModeIsAsFile() const {
+  return (requested_plugin_mode_ == NP_ASFILE ||
+          requested_plugin_mode_ == NP_ASFILEONLY);
+}
+
 }  // namespace npapi
 }  // namespace webkit