summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-09 01:05:54 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-09 01:05:54 +0000
commit6929abb7926fe2bf91977ce638e3b38a87cfe66a (patch)
treeba93e71a9e9bc358efaa28f395e91c93c4332e3c /chrome/test/ui/ui_test.cc
parent01ba15f7ff530575d976b57e92fb4433dcdc5aaf (diff)
downloadchromium_src-6929abb7926fe2bf91977ce638e3b38a87cfe66a.zip
chromium_src-6929abb7926fe2bf91977ce638e3b38a87cfe66a.tar.gz
chromium_src-6929abb7926fe2bf91977ce638e3b38a87cfe66a.tar.bz2
Bind tracing control methods to pyauto.
Review URL: https://chromiumcodereview.appspot.com/10539076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index a478d34..f5eae5a 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -516,6 +516,17 @@ void UITestBase::AppendBrowserLaunchSwitch(const char* name,
launch_arguments_.AppendSwitchASCII(name, value);
}
+bool UITestBase::BeginTracing(const std::string& categories) {
+ return automation()->BeginTracing(categories);
+}
+
+std::string UITestBase::EndTracing() {
+ std::string json_trace_output;
+ if (!automation()->EndTracing(&json_trace_output))
+ return "";
+ return json_trace_output;
+}
+
// UITest methods
void UITest::SetUp() {