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

chrome/common/resource_dispatcher_unittest.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 <string>
 #include <vector>
 
 #include "base/process.h"
 #include "base/ref_counted.h"
 #include "chrome/common/filter_policy.h"
@@ skipping 66 matching lines @@
     return true;
   }
 
   // Emulates the browser process and processes the pending IPC messages,
   // returning the hardcoded file contents.
   void ProcessMessages() {
     while (!message_queue_.empty()) {
       void* iter = NULL;
 
       int request_id;
-      ASSERT_TRUE(ReadParam(&message_queue_[0], &iter, &request_id));
+      ASSERT_TRUE(IPC::ReadParam(&message_queue_[0], &iter, &request_id));
 
       ViewHostMsg_Resource_Request request;
-      ASSERT_TRUE(ReadParam(&message_queue_[0], &iter, &request));
+      ASSERT_TRUE(IPC::ReadParam(&message_queue_[0], &iter, &request));
 
       // check values
       EXPECT_EQ(test_page_url, request.url.spec());
 
       // received response message
       ViewMsg_Resource_ResponseHead response;
       std::string raw_headers(test_page_headers);
       std::replace(raw_headers.begin(), raw_headers.end(), '\n', '\0');
       response.headers = new net::HttpResponseHeaders(raw_headers);
       response.mime_type = test_page_mime_type;
@@ skipping 11 matching lines @@
       base::SharedMemoryHandle dup_handle;
       EXPECT_TRUE(shared_mem.GiveToProcess(
           base::Process::Current().handle(), &dup_handle));
       dispatcher_->OnReceivedData(request_id, dup_handle, test_page_contents_len);
 
       message_queue_.erase(message_queue_.begin());
 
       // read the ack message.
       iter = NULL;
       int request_ack = -1;
-      ASSERT_TRUE(ReadParam(&message_queue_[0], &iter, &request_ack));
+      ASSERT_TRUE(IPC::ReadParam(&message_queue_[0], &iter, &request_ack));
 
       ASSERT_EQ(request_ack, request_id);
 
       message_queue_.erase(message_queue_.begin());
     }
   }
 
  protected:
   static ResourceDispatcher* GetResourceDispatcher(WebFrame* unused) {
     return dispatcher_;
@@ skipping 45 matching lines @@
 }
 
 TEST_F(ResourceDispatcherTest, Cookies) {
   // FIXME
 }
 
 TEST_F(ResourceDispatcherTest, SerializedPostData) {
   // FIXME
 }