Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Unified Diff: chrome/browser/automation/automation_provider.cc

Issue 21039: Revert my change to get the tree green. Not sure why the tests became flaky.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/chrome_main_uitest.cc ('k') | chrome/browser/browser_accessibility.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/automation_provider.cc
===================================================================
--- chrome/browser/automation/automation_provider.cc (revision 9131)
+++ chrome/browser/automation/automation_provider.cc (working copy)
@@ -1071,9 +1071,7 @@
IPC::Message* msg = new IPC::Message(
message.routing_id(), AutomationMsg_RedirectsFromResponse::ID,
IPC::Message::PRIORITY_NORMAL);
- msg->WriteBool(false);
- std::vector<GURL> empty;
- ParamTraits<std::vector<GURL>>::Write(msg, empty);
+ msg->WriteInt(-1); // Negative string count indicates an error.
Send(msg);
}
@@ -1556,17 +1554,14 @@
IPC::Message* msg = new IPC::Message(redirect_query_routing_id_,
AutomationMsg_RedirectsFromResponse::ID,
IPC::Message::PRIORITY_NORMAL);
- std::vector<GURL> redirects_gurl;
if (success) {
- msg->WriteBool(true);
+ msg->WriteInt(static_cast<int>(redirects->size()));
for (size_t i = 0; i < redirects->size(); i++)
- redirects_gurl.push_back(redirects->at(i));
+ IPC::ParamTraits<GURL>::Write(msg, redirects->at(i));
} else {
msg->WriteInt(-1); // Negative count indicates failure.
}
- ParamTraits<std::vector<GURL>>::Write(msg, redirects_gurl);
-
Send(msg);
redirect_query_ = NULL;
}
« no previous file with comments | « chrome/app/chrome_main_uitest.cc ('k') | chrome/browser/browser_accessibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698