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

chrome/test/pyautolib/pyautolib.h

Index: chrome/test/pyautolib/pyautolib.h
diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h
index b18236e798b07784fef043abb9bcb3bab7d6f74c..cd7cf5ddbb81e7a50a61d918badb30d75b0035b7 100644
--- a/chrome/test/pyautolib/pyautolib.h
+++ b/chrome/test/pyautolib/pyautolib.h
@@ -71,47 +71,6 @@ class PyUITestBase : public UITestBase {
 
   // AutomationProxy methods
 
-  // Returns bookmark bar visibility state.
-  bool GetBookmarkBarVisibility();
-
-  // Returns true if the bookmark bar is visible in the detached state.
-  bool IsBookmarkBarDetached();
-
-  // Returns bookmark bar animation state.  Warning: timing issues may
-  // change this return value unexpectedly.
-  bool IsBookmarkBarAnimating();
-
-  // Wait for the bookmark bar animation to complete.
-  // If |wait_for_open| is true, wait for it to open.
-  // If |wait_for_open| is false, wait for it to close.
-  bool WaitForBookmarkBarVisibilityChange(bool wait_for_open,
-                                          int window_index = 0);
-
-  // Get the bookmarks as a JSON string.  Internal method.
-  std::string _GetBookmarksAsJSON(int window_index = 0);
-
-  // Editing of the bookmark model.  Bookmarks are referenced by id.
-  // The id is a std::wstring, not an int64, for convenience, since
-  // the python side gets IDs converted from a JSON representation
-  // (which "extracts" into a string, not an int).  Since IDs are
-  // grabbed from the current model (and not generated), a conversion
-  // is unnecessary.  URLs are strings and not GURLs for a similar reason.
-  // Bookmark or group (folder) creation:
-  bool AddBookmarkGroup(std::wstring& parent_id, int index,
-                        std::wstring& title, int window_index = 0);
-  bool AddBookmarkURL(std::wstring& parent_id, int index,
-                      std::wstring& title, std::wstring& url,
-                      int window_index = 0);
-  // Bookmark editing:
-  bool ReparentBookmark(std::wstring& id, std::wstring& new_parent_id,
-                        int index, int window_index = 0);
-  bool SetBookmarkTitle(std::wstring& id, std::wstring& title,
-                        int window_index = 0);
-  bool SetBookmarkURL(std::wstring& id, std::wstring& url,
-                      int window_index = 0);
-  // Finally, bookmark deletion:
-  bool RemoveBookmark(std::wstring& id, int window_index = 0);
-
   // Get a handle to browser window at the given index, or NULL on failure.
   scoped_refptr<BrowserProxy> GetBrowserWindow(int window_index);
 
@@ -164,9 +123,6 @@ class PyUITestBase : public UITestBase {
       const base::TimeDelta& timeout,
       std::string* response);
 
-  // Gets the current state of the bookmark bar. Returns false if it failed.
-  bool GetBookmarkBarState(bool* visible, bool* detached, int window_index = 0);
-
   // Enables PostTask to main thread.
   // Should be shared across multiple instances of PyUITestBase so that this
   // class is re-entrant and multiple instances can be created.