1 files changed, 21 insertions, 8 deletions
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index 0745a90..0076047 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -9,7 +9,6 @@
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/automation/automation_provider.h"
-#include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/save_package.h"
@@ -975,7 +974,9 @@ void AutomationProviderDownloadItemObserver::OnDownloadFileCompleted(
     DownloadItem* download) {
   download->RemoveObserver(this);
   if (--downloads_ == 0) {
-    AutomationJSONReply(provider_, reply_message_).SendSuccess(NULL);
+    AutomationMsg_SendJSONRequest::WriteReplyParams(
+        reply_message_, std::string("{}"), true);
+    provider_->Send(reply_message_);
     delete this;
   }
 }
@@ -983,6 +984,8 @@ void AutomationProviderDownloadItemObserver::OnDownloadFileCompleted(
 void AutomationProviderHistoryObserver::HistoryQueryComplete(
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
+  std::string json_return;
+  bool reply_return = true;
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
 
   ListValue* history_list = new ListValue;
@@ -1002,20 +1005,26 @@ void AutomationProviderHistoryObserver::HistoryQueryComplete(
 
   return_value->Set(L"history", history_list);
   // Return history info.
-  AutomationJSONReply reply(provider_, reply_message_);
-  reply.SendSuccess(return_value.get());
+  base::JSONWriter::Write(return_value.get(), false, &json_return);
+  AutomationMsg_SendJSONRequest::WriteReplyParams(
+      reply_message_, json_return, reply_return);
+  provider_->Send(reply_message_);
   delete this;
 }
 
 void AutomationProviderImportSettingsObserver::ImportEnded() {
   // Send back an empty success message.
-  AutomationJSONReply(provider_, reply_message_).SendSuccess(NULL);
+  AutomationMsg_SendJSONRequest::WriteReplyParams(
+      reply_message_, std::string("{}"), true);
+  provider_->Send(reply_message_);
   delete this;
 }
 
 void AutomationProviderBrowsingDataObserver::OnBrowsingDataRemoverDone() {
   // Send back an empty success message
-  AutomationJSONReply(provider_, reply_message_).SendSuccess(NULL);
+  AutomationMsg_SendJSONRequest::WriteReplyParams(
+      reply_message_, std::string("{}"), true);
+  provider_->Send(reply_message_);
   delete this;
 }
 
@@ -1042,7 +1051,9 @@ void OmniboxAcceptNotificationObserver::Observe(
     const NotificationDetails& details) {
   if (type == NotificationType::LOAD_STOP ||
       type == NotificationType::AUTH_NEEDED) {
-    AutomationJSONReply(automation_, reply_message_).SendSuccess(NULL);
+    AutomationMsg_SendJSONRequest::WriteReplyParams(
+        reply_message_, std::string("{}"), false);
+    automation_->Send(reply_message_);
     delete this;
   } else {
     NOTREACHED();
@@ -1064,7 +1075,9 @@ void SavePackageNotificationObserver::Observe(
     const NotificationSource& source,
     const NotificationDetails& details) {
   if (type == NotificationType::SAVE_PACKAGE_SUCCESSFULLY_FINISHED) {
-    AutomationJSONReply(automation_, reply_message_).SendSuccess(NULL);
+    AutomationMsg_SendJSONRequest::WriteReplyParams(
+        reply_message_, std::string("{}"), true);
+    automation_->Send(reply_message_);
     delete this;
   } else {
     NOTREACHED();