Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/test/automation/automation_proxy.cc

 // Copyright (c) 2006-2008 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 <sstream>
 
 #include "chrome/test/automation/automation_proxy.h"
 
 #include "base/logging.h"
 #include "base/ref_counted.h"
+#include "chrome/common/ipc_message_macros.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/views/dialog_delegate.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
@@ skipping 525 matching lines @@
   IPC::Message* response = NULL;
   bool succeeded = SendAndWaitForResponse(
     new AutomationMsg_CreateExternalTab(0, parent, dimensions, style),
     &response, AutomationMsg_CreateExternalTabResponse::ID);
   if (!succeeded) {
     return NULL;
   }
   void* iter = NULL;
   int handle = 0;
   TabProxy* tab_proxy = NULL;
-  if (ReadParam(response, &iter, external_tab_container) &&
+  if (IPC::ReadParam(response, &iter, external_tab_container) &&
       IsWindow(*external_tab_container)) {
     if (response->ReadInt(&iter, &handle) &&
         (handle >= 0)) {
       succeeded = true;
       tab_proxy = new TabProxy(this, tracker_.get(), handle);
     }
   } else {
     succeeded = false;
   }
   delete response;
   return tab_proxy;
 }