Remove IPC::MessageIterator.

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"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/pickle.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_checker.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message_utils.h"
 
@@ skipping 123 matching lines @@
 
 bool Channel::ChannelImpl::WillDispatchInputMessage(Message* msg) {
   // Make sure we get a hello when client validation is required.
   if (validate_client_)
     return IsHelloMessage(*msg);
   return true;
 }
 
 void Channel::ChannelImpl::HandleHelloMessage(const Message& msg) {
   // The hello message contains one parameter containing the PID.
-  MessageIterator it = MessageIterator(msg);
-  int32 claimed_pid =  it.NextInt();
-  if (validate_client_ && (it.NextInt() != client_secret_)) {
+  PickleIterator it(msg);
+  int32 claimed_pid;
+  if (!it.ReadInt(&claimed_pid)) {
     NOTREACHED();
-    // Something went wrong. Abort connection.
     Close();
     listener()->OnChannelError();
     return;
   }
+
+  if (validate_client_) {
+    int32 secret;
+    bool result = it.ReadInt(&secret);
+    if (!result || secret != client_secret_) {
+      NOTREACHED();

[jam, 2012/12/17 16:21:57]

seems unfortunate to duplicate this little block twice. can you use a local
variable so that there's only one block for failure

+      Close();
+      listener()->OnChannelError();
+      return;
+    }
+  }
+
   peer_pid_ = claimed_pid;
-  // validation completed.
+  // Validation completed.
   validate_client_ = false;
   listener()->OnChannelConnected(claimed_pid);
 }
 
 bool Channel::ChannelImpl::DidEmptyInputBuffers() {
   // We don't need to do anything here.
   return true;
 }
 
 // static
@@ skipping 323 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