POSIX: Rename DescriptorSet to FileDescriptorSet

This is just following up on a code review promise.


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

1 files changed, 12 insertions, 12 deletions

diff --git a/chrome/common/ipc_message.cc b/chrome/common/ipc_message.cc
index 9a15f1c..593b763 100644
--- a/chrome/common/ipc_message.cc
+++ b/chrome/common/ipc_message.cc
@@ -8,7 +8,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_POSIX)
-#include "chrome/common/descriptor_set_posix.h"
+#include "chrome/common/file_descriptor_set_posix.h"
 #endif
 
 namespace IPC {
@@ -45,7 +45,7 @@ Message::Message(const char* data, int data_len) : Pickle(data, data_len) {
 Message::Message(const Message& other) : Pickle(other) {
   InitLoggingVariables();
 #if defined(OS_POSIX)
-  descriptor_set_ = other.descriptor_set_;
+  file_descriptor_set_ = other.file_descriptor_set_;
 #endif
 }
 
@@ -60,7 +60,7 @@ void Message::InitLoggingVariables() {
 Message& Message::operator=(const Message& other) {
   *static_cast<Pickle*>(this) = other;
 #if defined(OS_POSIX)
-  descriptor_set_ = other.descriptor_set_;
+  file_descriptor_set_ = other.file_descriptor_set_;
 #endif
   return *this;
 }
@@ -90,11 +90,11 @@ void Message::set_received_time(int64 time) const {
 bool Message::WriteFileDescriptor(const base::FileDescriptor& descriptor) {
   // We write the index of the descriptor so that we don't have to
   // keep the current descriptor as extra decoding state when deserialising.
-  WriteInt(descriptor_set()->size());
+  WriteInt(file_descriptor_set()->size());
   if (descriptor.auto_close) {
-    return descriptor_set()->AddAndAutoClose(descriptor.fd);
+    return file_descriptor_set()->AddAndAutoClose(descriptor.fd);
   } else {
-    return descriptor_set()->Add(descriptor.fd);
+    return file_descriptor_set()->Add(descriptor.fd);
   }
 }
 
@@ -104,19 +104,19 @@ bool Message::ReadFileDescriptor(void** iter,
   if (!ReadInt(iter, &descriptor_index))
     return false;
 
-  DescriptorSet* descriptor_set = descriptor_set_.get();
-  if (!descriptor_set)
+  FileDescriptorSet* file_descriptor_set = file_descriptor_set_.get();
+  if (!file_descriptor_set)
     return false;
 
-  descriptor->fd = descriptor_set->GetDescriptorAt(descriptor_index);
+  descriptor->fd = file_descriptor_set->GetDescriptorAt(descriptor_index);
   descriptor->auto_close = false;
 
   return descriptor->fd >= 0;
 }
 
-void Message::EnsureDescriptorSet() {
-  if (descriptor_set_.get() == NULL)
-    descriptor_set_ = new DescriptorSet;
+void Message::EnsureFileDescriptorSet() {
+  if (file_descriptor_set_.get() == NULL)
+    file_descriptor_set_ = new FileDescriptorSet;
 }
 
 #endif