summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/ui_test.cc11
-rw-r--r--chrome/test/ui/ui_test.h6
2 files changed, 17 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() {
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index b7d8968..e6c893f 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -244,6 +244,12 @@ class UITestBase {
// browser when launched.
void AppendBrowserLaunchSwitch(const char* name, const char* value);
+ // Pass-through to AutomationProxy::BeginTracing.
+ bool BeginTracing(const std::string& categories);
+
+ // Pass-through to AutomationProxy::EndTracing.
+ std::string EndTracing();
+
protected:
// String to display when a test fails because the crash service isn't
// running.