Mojo: Add/use |typedef std::vector<scoped_refptr<Dispatcher> > DispatcherVector.

mojo/system/transport_data.cc

 // Copyright 2014 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 "mojo/system/transport_data.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 28 matching lines @@
   COMPILE_ASSERT(kMaxSerializedDispatcherSize %
                      MessageInTransit::kMessageAlignment == 0,
                  kMaxSerializedDispatcherSize_not_a_multiple_of_alignment);
 
   // The size of |HandleTableEntry| must be a multiple of the alignment.
   COMPILE_ASSERT(sizeof(HandleTableEntry) %
                      MessageInTransit::kMessageAlignment == 0,
                  sizeof_MessageInTransit_HandleTableEntry_invalid);
 };
 
-TransportData::TransportData(
-    scoped_ptr<std::vector<scoped_refptr<Dispatcher> > > dispatchers,
-    Channel* channel)
+TransportData::TransportData(scoped_ptr<DispatcherVector> dispatchers,
+                             Channel* channel)
     : buffer_size_(0) {
   DCHECK(dispatchers);
   DCHECK(channel);
 
   const size_t num_handles = dispatchers->size();
   DCHECK_GT(num_handles, 0u);
 
   // The offset to the start of the (Mojo) handle table.
   const size_t handle_table_start_offset = sizeof(Header);
   // The offset to the start of the serialized dispatcher data.
@@ skipping 150 matching lines @@
     // Note: This is an overflow-safe check for |offset + size > buffer_size|
     // (we know that |size <= buffer_size| from the previous check).
     if (offset > buffer_size - size)
       return kInvalidSerializedDispatcher;
   }
 
   return NULL;
 }
 
 // static
-scoped_ptr<std::vector<scoped_refptr<Dispatcher> > >
-    TransportData::DeserializeDispatchersFromBuffer(const void* buffer,
-                                                    size_t buffer_size,
-                                                    Channel* channel) {
+scoped_ptr<DispatcherVector> TransportData::DeserializeDispatchersFromBuffer(
+    const void* buffer,
+    size_t buffer_size,
+    Channel* channel) {
   DCHECK(buffer);
   DCHECK_GT(buffer_size, 0u);
   DCHECK(channel);
 
   const Header* header = static_cast<const Header*>(buffer);
   const size_t num_handles = header->num_handles;
-  scoped_ptr<std::vector<scoped_refptr<Dispatcher> > > dispatchers(
-      new std::vector<scoped_refptr<Dispatcher> >(num_handles));
+  scoped_ptr<DispatcherVector> dispatchers(new DispatcherVector(num_handles));
 
   const HandleTableEntry* handle_table =
       reinterpret_cast<const HandleTableEntry*>(
           static_cast<const char*>(buffer) + sizeof(Header));
   for (size_t i = 0; i < num_handles; i++) {
     size_t offset = handle_table[i].offset;
     size_t size = handle_table[i].size;
     // Should already have been checked by |ValidateBuffer()|:
     DCHECK_EQ(offset % MessageInTransit::kMessageAlignment, 0u);
     DCHECK_LE(offset, buffer_size);
     DCHECK_LE(offset + size, buffer_size);
 
     const void* source = static_cast<const char*>(buffer) + offset;
     (*dispatchers)[i] = Dispatcher::TransportDataAccess::Deserialize(
         channel, handle_table[i].type, source, size);
   }
 
   return dispatchers.Pass();
 }
 
 }  // namespace system
 }  // namespace mojo