Refactor Pickle Read methods to use higher performance PickleIterator.

chrome/test/automation/automation_proxy.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "chrome/test/automation/automation_proxy.h"
 
 #include <sstream>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 60 matching lines @@
     server_->SignalNewTabUITab(-1);
   }
 
  private:
   void NewTabLoaded(int load_time) {
     server_->SignalNewTabUITab(load_time);
   }
 
   void OnAutomationHello(const IPC::Message& hello_message) {
     std::string server_version;
-    void* iter = NULL;
+    PickleIterator iter(hello_message);
     if (!hello_message.ReadString(&iter, &server_version)) {
       // We got an AutomationMsg_Hello from an old automation provider
       // that doesn't send version info. Leave server_version as an empty
       // string to signal a version mismatch.
       LOG(ERROR) << "Pre-versioning protocol detected in automation provider.";
     }
 
     server_->SignalAppLaunch(server_version);
   }
 
@@ skipping 362 matching lines @@
     // to avoid the slowness.
     channel_disconnected_on_failure_ = true;
     LOG(ERROR) << "Disconnecting channel after error!";
     Disconnect();
   }
 
   return success;
 }
 
 void AutomationProxy::InvalidateHandle(const IPC::Message& message) {
-  void* iter = NULL;
+  PickleIterator iter(message);
   int handle;
 
   if (message.ReadInt(&iter, &handle)) {
     tracker_->InvalidateHandle(handle);
   }
 }
 
 bool AutomationProxy::OpenNewBrowserWindow(Browser::Type type, bool show) {
   return Send(
       new AutomationMsg_OpenNewBrowserWindowOfType(static_cast<int>(type),
@@ skipping 107 matching lines @@
 }
 
 bool AutomationProxy::SendJSONRequest(const std::string& request,
                                       int timeout_ms,
                                       std::string* response) {
   bool result = false;
   if (!SendAutomationJSONRequest(this, request, timeout_ms, response, &result))
     return false;
   return result;
 }