Further cleanup in PluginStream.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10495008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150667 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 15 insertions, 13 deletions

diff --git a/webkit/plugins/npapi/plugin_stream.cc b/webkit/plugins/npapi/plugin_stream.cc
index 5b637fa..8946030 100644
--- a/webkit/plugins/npapi/plugin_stream.cc
+++ b/webkit/plugins/npapi/plugin_stream.cc
@@ -109,8 +109,7 @@ bool PluginStream::Open(const std::string& mime_type,
   }
   // 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;
     }
@@ -141,17 +140,16 @@ int PluginStream::Write(const char* buffer, const int length,
 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;
@@ -191,8 +189,7 @@ void PluginStream::OnDelayDelivery() {
     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(),
@@ -287,5 +284,10 @@ void PluginStream::Notify(NPReason reason) {
   }
 }
 
+bool PluginStream::RequestedPluginModeIsAsFile() const {
+  return (requested_plugin_mode_ == NP_ASFILE ||
+          requested_plugin_mode_ == NP_ASFILEONLY);
+}
+
 }  // namespace npapi
 }  // namespace webkit
diff --git a/webkit/plugins/npapi/plugin_stream.h b/webkit/plugins/npapi/plugin_stream.h
index 72fb2d2..2bc691a 100644
--- a/webkit/plugins/npapi/plugin_stream.h
+++ b/webkit/plugins/npapi/plugin_stream.h
@@ -129,6 +129,9 @@ class PluginStream : public base::RefCounted<PluginStream> {
   // Returns true if the temp file is valid and open for writing.
   bool TempFileIsValid() const;
 
+  // Returns true if |requested_plugin_mode_| is NP_ASFILE or NP_ASFILEONLY.
+  bool RequestedPluginModeIsAsFile() const;
+
  private:
   NPStream                      stream_;
   std::string                   headers_;
diff --git a/webkit/plugins/npapi/plugin_stream_posix.cc b/webkit/plugins/npapi/plugin_stream_posix.cc
index 888ad14..3422d99 100644
--- a/webkit/plugins/npapi/plugin_stream_posix.cc
+++ b/webkit/plugins/npapi/plugin_stream_posix.cc
@@ -23,10 +23,8 @@ void PluginStream::ResetTempFileName() {
 }
 
 void PluginStream::WriteAsFile() {
-  if (requested_plugin_mode_ == NP_ASFILE ||
-      requested_plugin_mode_ == NP_ASFILEONLY) {
+  if (RequestedPluginModeIsAsFile())
     instance_->NPP_StreamAsFile(&stream_, temp_file_path_.value().c_str());
-  }
 }
 
 size_t PluginStream::WriteBytes(const char* buf, size_t length) {
diff --git a/webkit/plugins/npapi/plugin_stream_win.cc b/webkit/plugins/npapi/plugin_stream_win.cc
index 70c0fda..1db0663 100644
--- a/webkit/plugins/npapi/plugin_stream_win.cc
+++ b/webkit/plugins/npapi/plugin_stream_win.cc
@@ -19,8 +19,7 @@ void PluginStream::ResetTempFileName() {
 }
 
 void PluginStream::WriteAsFile() {
-  if (requested_plugin_mode_ == NP_ASFILE ||
-      requested_plugin_mode_ == NP_ASFILEONLY)
+  if (RequestedPluginModeIsAsFile())
     instance_->NPP_StreamAsFile(&stream_, temp_file_name_);
 }