Update ChannelReader to use AttachmentBroker.

ipc/ipc_channel_win.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 "ipc/ipc_channel_win.h"
 
 #include <windows.h>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 154 matching lines @@
   // will be signalled even in the "synchronously completed" state.
   //
   // This allows us to potentially process some outgoing messages and
   // interleave other work on this thread when we're getting hammered with
   // input messages. Potentially, this could be tuned to be more efficient
   // with some testing.
   input_state_.is_pending = true;
   return READ_PENDING;
 }
 
-bool ChannelWin::WillDispatchInputMessage(Message* msg) {
+bool ChannelWin::ShouldDispatchInputMessage(Message* msg) {
   // Make sure we get a hello when client validation is required.
   if (validate_client_)
     return IsHelloMessage(*msg);
   return true;
 }
 
+bool ChannelWin::GetNonBrokeredAttachments(Message* msg) {
+  return true;
+}
+
 void ChannelWin::HandleInternalMessage(const Message& msg) {
   DCHECK_EQ(msg.type(), static_cast<unsigned>(Channel::HELLO_MESSAGE_TYPE));
   // The hello message contains one parameter containing the PID.
   base::PickleIterator it(msg);
   int32 claimed_pid;
   bool failed = !it.ReadInt(&claimed_pid);
 
   if (!failed && validate_client_) {
     int32 secret;
     failed = it.ReadInt(&secret) ? (secret != client_secret_) : true;
@@ skipping 271 matching lines @@
 
     // We don't support recursion through OnMessageReceived yet!
     DCHECK(!processing_incoming_);
     base::AutoReset<bool> auto_reset_processing_incoming(
         &processing_incoming_, true);
 
     // Process the new data.
     if (input_state_.is_pending) {
       // This is the normal case for everything except the initialization step.
       input_state_.is_pending = false;
-      if (!bytes_transfered)
+      if (!bytes_transfered) {
         ok = false;
-      else if (pipe_.IsValid())
-        ok = AsyncReadComplete(bytes_transfered);
+      } else if (pipe_.IsValid()) {
+        ok = (AsyncReadComplete(bytes_transfered) != DISPATCH_ERROR);
+      }
     } else {
       DCHECK(!bytes_transfered);
     }
 
     // Request more data.
     if (ok)
-      ok = ProcessIncomingMessages();
+      ok = (ProcessIncomingMessages() != DISPATCH_ERROR);
   } else {
     DCHECK(context == &output_state_.context);
     CHECK(output_state_.is_pending);
     ok = ProcessOutgoingMessages(context, bytes_transfered);
   }
   if (!ok && pipe_.IsValid()) {
     // We don't want to re-enter Close().
     Close();
     listener()->OnChannelError();
   }
@@ skipping 30 matching lines @@
   int secret;
   do {  // Guarantee we get a non-zero value.
     secret = base::RandInt(0, std::numeric_limits<int>::max());
   } while (secret == 0);
 
   id.append(GenerateUniqueRandomChannelID());
   return id.append(base::StringPrintf("\\%d", secret));
 }
 
 }  // namespace IPC