From 87930be9c2f649026664778f132b2a003984d489 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Tue, 22 Nov 2011 19:09:58 +0000 Subject: gtest / gmock shouldn't be in the shipping product Remove dependencies from automation on testing libraries that pull in gtest / gmock directly or indirectly. Do this by pulling ASSERTs out of chrome code and putting them into test code instead. Also delete some unused code. BUG=none TEST=none Review URL: http://codereview.chromium.org/8584013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111187 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/test/automation/dom_element_proxy.h | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'chrome/test/automation/dom_element_proxy.h') diff --git a/chrome/test/automation/dom_element_proxy.h b/chrome/test/automation/dom_element_proxy.h index 97a0b4d..d1e1b71 100644 --- a/chrome/test/automation/dom_element_proxy.h +++ b/chrome/test/automation/dom_element_proxy.h @@ -157,27 +157,11 @@ class DOMElementProxy : public JavaScriptObjectProxy { // Retrieves the element's visibility. Returns true on success. bool GetVisibility(bool* visilibity); - // Asserts that no elements can be found by the given locator method. - void EnsureFindNoElements(const By& by); - - // Asserts that |expected_text| matches all the text in this element. This - // includes the value of textfields and inputs. - void EnsureTextMatches(const std::string& expected_text); - - // Asserts that |expected_html| matches the element's inner html. - void EnsureInnerHTMLMatches(const std::string& expected_html); - - // Asserts that |expected_name| matches the element's name. - void EnsureNameMatches(const std::string& expected_name); - - // Asserts that |expected_visibility| matches the element's visibility. - void EnsureVisibilityMatches(bool expected_visibility); - - // Asserts that |expected_value| eventually matches the element's value for + // Returns if |expected_value| eventually matches the element's value for // |attribute|. This function will block until the timeout is exceeded, in // which case it will fail, or until the two values match. - void EnsureAttributeEventuallyMatches(const std::string& attribute, - const std::string& expected_value); + bool DoesAttributeEventuallyMatch(const std::string& attribute, + const std::string& expected_value); private: // Gets the element's value for the given type. This is a helper method -- cgit v1.1