3 files changed, 25 insertions, 0 deletions
diff --git a/chrome/test/pyautolib/pyautolib.i b/chrome/test/pyautolib/pyautolib.i
index 0710404..40222a7 100644
--- a/chrome/test/pyautolib/pyautolib.i
+++ b/chrome/test/pyautolib/pyautolib.i
@@ -223,6 +223,14 @@ class PyUITestBase {
   void AppendBrowserLaunchSwitch(const char* name);
   void AppendBrowserLaunchSwitch(const char* name, const char* value);
 
+  %feature("docstring", "Begins tracing with the given category string.")
+      BeginTracing;
+  bool BeginTracing(const std::string& categories);
+
+  %feature("docstring", "Ends tracing and returns the collected events.")
+      EndTracing;
+  std::string EndTracing();
+
   void UseNamedChannelID(const std::string& named_channel_id);
 
   %feature("docstring",
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.