Final set of conversions of automation calls to the JSON interface.

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2012 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_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 1385 matching lines @@
                                                         true);
     automation_->Send(reply_message_.release());
   }
   delete this;
 }
 
 AutomationProviderBookmarkModelObserver::
 AutomationProviderBookmarkModelObserver(
     AutomationProvider* provider,
     IPC::Message* reply_message,
-    BookmarkModel* model)
+    BookmarkModel* model,
+    bool use_json_interface)
     : automation_provider_(provider->AsWeakPtr()),
       reply_message_(reply_message),
-      model_(model) {
+      model_(model),
+      use_json_interface_(use_json_interface) {
   model_->AddObserver(this);
 }
 
 AutomationProviderBookmarkModelObserver::
     ~AutomationProviderBookmarkModelObserver() {
   model_->RemoveObserver(this);
 }
 
 void AutomationProviderBookmarkModelObserver::Loaded(BookmarkModel* model,
                                                      bool ids_reassigned) {
   ReplyAndDelete(true);
 }
 
 void AutomationProviderBookmarkModelObserver::BookmarkModelBeingDeleted(
     BookmarkModel* model) {
   ReplyAndDelete(false);
 }
 
+IPC::Message* AutomationProviderBookmarkModelObserver::ReleaseReply() {
+  return reply_message_.release();
+}
+
 void AutomationProviderBookmarkModelObserver::ReplyAndDelete(bool success) {
   if (automation_provider_) {
-    AutomationMsg_WaitForBookmarkModelToLoad::WriteReplyParams(
-        reply_message_.get(), success);
-    automation_provider_->Send(reply_message_.release());
+    if (use_json_interface_) {
+      AutomationJSONReply(automation_provider_,
+                          reply_message_.release()).SendSuccess(NULL);
+    } else {
+      AutomationMsg_WaitForBookmarkModelToLoad::WriteReplyParams(
+          reply_message_.get(), success);
+      automation_provider_->Send(reply_message_.release());
+    }
   }
   delete this;
 }
 
 AutomationProviderDownloadUpdatedObserver::
 AutomationProviderDownloadUpdatedObserver(
     AutomationProvider* provider,
     IPC::Message* reply_message,
     bool wait_for_open)
     : provider_(provider->AsWeakPtr()),
@@ skipping 1714 matching lines @@
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }