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

chrome/browser/automation/automation_provider_observers.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 1027 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PhotoCaptureObserver);
 };
 
 #endif  // defined(OS_CHROMEOS)
 
 // Waits for the bookmark model to load.
 class AutomationProviderBookmarkModelObserver : public BookmarkModelObserver {
  public:
   AutomationProviderBookmarkModelObserver(AutomationProvider* provider,
                                           IPC::Message* reply_message,
-                                          BookmarkModel* model);
+                                          BookmarkModel* model,
+                                          bool use_json_interface);

[Nirnimesh, 2012/08/10 04:34:20]

Is this class used by anything other than pyauto?

[craigdh, 2012/08/10 18:08:04]

Used by WaitForBookmarkModelToLoad, which is used by sync tests. I actually
converted this, then had to switch it back to support both.

   virtual ~AutomationProviderBookmarkModelObserver();
 
   // BookmarkModelObserver:
   virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE;
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
                                  int new_index) OVERRIDE {}
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
                                  int index) OVERRIDE {}
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node) OVERRIDE {}
   virtual void BookmarkNodeChanged(BookmarkModel* model,
                                    const BookmarkNode* node) OVERRIDE {}
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
                                           const BookmarkNode* node) OVERRIDE {}
   virtual void BookmarkNodeChildrenReordered(
       BookmarkModel* model,
       const BookmarkNode* node) OVERRIDE {}
 
+  IPC::Message* ReleaseReply();
+
  private:
   // Reply to the automation message with the given success value,
   // then delete myself (which removes myself from the bookmark model
   // observer list).
   void ReplyAndDelete(bool success);
 
   base::WeakPtr<AutomationProvider> automation_provider_;
   scoped_ptr<IPC::Message> reply_message_;
   BookmarkModel* model_;
+  bool use_json_interface_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProviderBookmarkModelObserver);
 };
 
 // Allows the automation provider to wait until the download has been updated
 // or opened.
 class AutomationProviderDownloadUpdatedObserver
     : public content::DownloadItem::Observer {
  public:
   AutomationProviderDownloadUpdatedObserver(
@@ skipping 894 matching lines @@
   base::WeakPtr<AutomationProvider> automation_;
   scoped_ptr<IPC::Message> reply_message_;
   int new_window_id_;
   int num_loads_;
 
   DISALLOW_COPY_AND_ASSIGN(
       BrowserOpenedWithExistingProfileNotificationObserver);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_PROVIDER_OBSERVERS_H_