diff options
author | craigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 22:59:03 +0000 |
---|---|---|
committer | craigdh@chromium.org <craigdh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 22:59:03 +0000 |
commit | 9329d68c95459fd0089bf66d4b6cbe5b046b882d (patch) | |
tree | 115a4c092a6274f1618684115e8e0fb0da0f81e0 /chrome/test/automation | |
parent | d1198fdc8cced343476dbe03ebe108fd44d85309 (diff) | |
download | chromium_src-9329d68c95459fd0089bf66d4b6cbe5b046b882d.zip chromium_src-9329d68c95459fd0089bf66d4b6cbe5b046b882d.tar.gz chromium_src-9329d68c95459fd0089bf66d4b6cbe5b046b882d.tar.bz2 |
Final set of conversions of automation calls to the JSON interface.
Converts the old bookmark automation commands.
TEST=PyAuto CONTINUOUS suite
BUG=132794
Review URL: https://chromiumcodereview.appspot.com/10828245
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r-- | chrome/test/automation/browser_proxy.cc | 103 | ||||
-rw-r--r-- | chrome/test/automation/browser_proxy.h | 29 |
2 files changed, 0 insertions, 132 deletions
diff --git a/chrome/test/automation/browser_proxy.cc b/chrome/test/automation/browser_proxy.cc index 2d6ac92a..6716da7 100644 --- a/chrome/test/automation/browser_proxy.cc +++ b/chrome/test/automation/browser_proxy.cc @@ -244,109 +244,6 @@ bool BrowserProxy::RunCommand(int browser_command) const { return result; } -bool BrowserProxy::GetBookmarkBarVisibility(bool* is_visible, - bool* is_animating, - bool* is_detached) { - if (!is_valid()) - return false; - - if (!is_visible || !is_animating) { - NOTREACHED(); - return false; - } - - return sender_->Send(new AutomationMsg_BookmarkBarVisibility( - handle_, is_visible, is_animating, is_detached)); -} - -bool BrowserProxy::GetBookmarksAsJSON(std::string *json_string) { - if (!is_valid()) - return false; - - if (!WaitForBookmarkModelToLoad()) - return false; - - bool result = false; - sender_->Send(new AutomationMsg_GetBookmarksAsJSON(handle_, - json_string, - &result)); - return result; -} - -bool BrowserProxy::WaitForBookmarkModelToLoad() { - if (!is_valid()) - return false; - - bool result = false; - sender_->Send(new AutomationMsg_WaitForBookmarkModelToLoad(handle_, &result)); - return result; -} - -bool BrowserProxy::AddBookmarkGroup(int64 parent_id, int index, - std::wstring& title) { - if (!is_valid()) - return false; - bool result = false; - sender_->Send(new AutomationMsg_AddBookmarkGroup(handle_, - parent_id, index, - title, - &result)); - return result; -} - -bool BrowserProxy::AddBookmarkURL(int64 parent_id, int index, - std::wstring& title, const GURL& url) { - if (!is_valid()) - return false; - bool result = false; - sender_->Send(new AutomationMsg_AddBookmarkURL(handle_, - parent_id, index, - title, url, - &result)); - return result; -} - -bool BrowserProxy::ReparentBookmark(int64 id, int64 new_parent_id, int index) { - if (!is_valid()) - return false; - bool result = false; - sender_->Send(new AutomationMsg_ReparentBookmark(handle_, - id, new_parent_id, - index, - &result)); - return result; -} - -bool BrowserProxy::SetBookmarkTitle(int64 id, const std::wstring& title) { - if (!is_valid()) - return false; - bool result = false; - sender_->Send(new AutomationMsg_SetBookmarkTitle(handle_, - id, title, - &result)); - return result; -} - -bool BrowserProxy::SetBookmarkURL(int64 id, const GURL& url) { - if (!is_valid()) - return false; - bool result = false; - sender_->Send(new AutomationMsg_SetBookmarkURL(handle_, - id, url, - &result)); - return result; -} - -bool BrowserProxy::RemoveBookmark(int64 id) { - if (!is_valid()) - return false; - bool result = false; - sender_->Send(new AutomationMsg_RemoveBookmark(handle_, - id, - &result)); - return result; -} - bool BrowserProxy::TerminateSession() { if (!is_valid()) return false; diff --git a/chrome/test/automation/browser_proxy.h b/chrome/test/automation/browser_proxy.h index d20792a..44e0cd3 100644 --- a/chrome/test/automation/browser_proxy.h +++ b/chrome/test/automation/browser_proxy.h @@ -122,35 +122,6 @@ class BrowserProxy : public AutomationResourceProxy { // executed, false otherwise. bool RunCommand(int browser_command) const WARN_UNUSED_RESULT; - // Returns whether the Bookmark bar is visible and whether we are animating - // it into position. Also returns whether it is currently detached from the - // location bar, as in the NTP. - // Returns false on failure. - bool GetBookmarkBarVisibility(bool* is_visible, - bool* is_animating, - bool* is_detached) WARN_UNUSED_RESULT; - - // Get the bookmarks as a JSON string and put it in |json_string|. - // Return true on success. - bool GetBookmarksAsJSON(std::string* json_string) WARN_UNUSED_RESULT; - - // Wait for the bookmarks to load. Called implicitly by GetBookmarksAsJSON(). - bool WaitForBookmarkModelToLoad() WARN_UNUSED_RESULT; - - // Editing of the bookmark model. Bookmarks are referenced by id. - // Bookmark or group (folder) creation: - bool AddBookmarkGroup(int64 parent_id, int index, - std::wstring& title) WARN_UNUSED_RESULT; - bool AddBookmarkURL(int64 parent_id, int index, - std::wstring& title, const GURL& url) WARN_UNUSED_RESULT; - // Bookmark editing: - bool ReparentBookmark(int64 id, int64 new_parent_id, - int index) WARN_UNUSED_RESULT; - bool SetBookmarkTitle(int64 id, const std::wstring& title) WARN_UNUSED_RESULT; - bool SetBookmarkURL(int64 id, const GURL& url) WARN_UNUSED_RESULT; - // Finally, bookmark deletion: - bool RemoveBookmark(int64 id) WARN_UNUSED_RESULT; - // Simulates a termination the browser session (as if the user logged off the // mahine). bool TerminateSession() WARN_UNUSED_RESULT; |