From 7d5c3acd124fae8816416374f629752138ec08e1 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 4 Feb 2009 08:58:19 +0000 Subject: Revert my change to get the tree green. Not sure why the tests became flaky. I'll try to check them in again but in smaller chunks tomorrow. TBR=mpcomplete Review URL: http://codereview.chromium.org/21039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9132 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/automation/automation_provider.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'chrome/browser/automation') diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index f3154a4..a613f78 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1071,9 +1071,7 @@ void AutomationProvider::GetRedirectsFrom(const IPC::Message& message, IPC::Message* msg = new IPC::Message( message.routing_id(), AutomationMsg_RedirectsFromResponse::ID, IPC::Message::PRIORITY_NORMAL); - msg->WriteBool(false); - std::vector empty; - ParamTraits>::Write(msg, empty); + msg->WriteInt(-1); // Negative string count indicates an error. Send(msg); } @@ -1556,17 +1554,14 @@ void AutomationProvider::OnRedirectQueryComplete( IPC::Message* msg = new IPC::Message(redirect_query_routing_id_, AutomationMsg_RedirectsFromResponse::ID, IPC::Message::PRIORITY_NORMAL); - std::vector redirects_gurl; if (success) { - msg->WriteBool(true); + msg->WriteInt(static_cast(redirects->size())); for (size_t i = 0; i < redirects->size(); i++) - redirects_gurl.push_back(redirects->at(i)); + IPC::ParamTraits::Write(msg, redirects->at(i)); } else { msg->WriteInt(-1); // Negative count indicates failure. } - ParamTraits>::Write(msg, redirects_gurl); - Send(msg); redirect_query_ = NULL; } -- cgit v1.1