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

chrome/browser/renderer_host/resource_dispatcher_host_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 <vector>
 
 #include "base/message_loop.h"
 #include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/common/chrome_plugin_lib.h"
@@ skipping 155 matching lines @@
 
   // The first messages should be received response
   ASSERT_EQ(ViewMsg_Resource_ReceivedResponse::ID, messages[0].type());
 
   // followed by the data, currently we only do the data in one chunk, but
   // should probably test multiple chunks later
   ASSERT_EQ(ViewMsg_Resource_DataReceived::ID, messages[1].type());
 
   void* iter = NULL;
   int request_id;
-  ASSERT_TRUE(ReadParam(&messages[1], &iter, &request_id));
+  ASSERT_TRUE(IPC::ReadParam(&messages[1], &iter, &request_id));
   base::SharedMemoryHandle shm_handle;
-  ASSERT_TRUE(ReadParam(&messages[1], &iter, &shm_handle));
+  ASSERT_TRUE(IPC::ReadParam(&messages[1], &iter, &shm_handle));
   int data_len;
-  ASSERT_TRUE(ReadParam(&messages[1], &iter, &data_len));
+  ASSERT_TRUE(IPC::ReadParam(&messages[1], &iter, &data_len));
 
   ASSERT_EQ(reference_data.size(), data_len);
   base::SharedMemory shared_mem(shm_handle, true);  // read only
   shared_mem.Map(data_len);
   const char* data = static_cast<char*>(shared_mem.memory());
   ASSERT_EQ(0, memcmp(reference_data.c_str(), data, data_len));
 
   // followed by a 0-byte read
   //ASSERT_EQ(ViewMsg_Resource_DataReceived::ID, messages[2].type());
 
@@ skipping 263 matching lines @@
   MakeTestRequest(0, 0, 1, URLRequestTestJob::test_url_1());
   MakeTestRequest(0, 1, 2, URLRequestTestJob::test_url_2());
   MakeTestRequest(0, 0, 3, URLRequestTestJob::test_url_3());
   MakeTestRequest(1, 1, 4, URLRequestTestJob::test_url_1());
   MakeTestRequest(0, 2, 5, URLRequestTestJob::test_url_2());
   MakeTestRequest(0, 2, 6, URLRequestTestJob::test_url_3());
 
   // Flush all the pending requests.
   while (URLRequestTestJob::ProcessOnePendingMessage());
 }