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

chrome/browser/automation/automation_provider.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 "chrome/browser/automation/automation_provider.h"
 
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h" 
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/automation/automation_provider_list.h"
@@ skipping 1053 matching lines @@
           source_url, &consumer_,
           NewCallback(this, &AutomationProvider::OnRedirectQueryComplete));
       return;  // Response will be sent when query completes.
     }
   }
 
   // Send failure response.
   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);
 }
 
 void AutomationProvider::GetActiveTabIndex(const IPC::Message& message,
                                            int handle) {
   int active_tab_index = -1;  // -1 is the error code
   if (browser_tracker_->ContainsHandle(handle)) {
     Browser* browser = browser_tracker_->GetResource(handle);
     active_tab_index = browser->selected_index();
   }
@@ skipping 462 matching lines @@
     HistoryService::Handle request_handle,
     GURL from_url,
     bool success,
     HistoryService::RedirectList* redirects) {
   DCHECK(request_handle == redirect_query_);
 
   // Respond to the pending request for the redirect list.
   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;
 }
 
 bool AutomationProvider::Send(IPC::Message* msg) {
   DCHECK(channel_.get());
   return channel_->Send(msg);
 }
 
 Browser* AutomationProvider::FindAndActivateTab(
@@ skipping 1024 matching lines @@
     }
   }
   Send(new AutomationMsg_OverrideEncodingResponse(message.routing_id(),
                                                   succeed));
 }
 
 void AutomationProvider::SavePackageShouldPromptUser(
     const IPC::Message& message, bool should_prompt) {
   SavePackage::SetShouldPromptUser(should_prompt);
 }