2 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 1861626..d9920c5 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -211,9 +211,14 @@ void UITest::InitializeTimeouts() {
   }
 }
 
+AutomationProxy* UITest::CreateAutomationProxy(int execution_timeout) {
+  // By default we create a plain vanilla AutomationProxy.
+  return new AutomationProxy(execution_timeout);
+}
+
 void UITest::LaunchBrowserAndServer() {
   // Set up IPC testing interface server.
-  server_.reset(new AutomationProxy(command_execution_timeout_ms_));
+  server_.reset(CreateAutomationProxy(command_execution_timeout_ms_));
 
   LaunchBrowser(launch_arguments_, clear_profile_);
   if (wait_for_initial_loads_)
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 794391b..2bd3b9e 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -71,6 +71,9 @@ class UITest : public testing::Test {
   // Launches the browser and IPC testing server.
   void LaunchBrowserAndServer();
 
+  // Overridable so that derived classes can provide their own AutomationProxy.
+  virtual AutomationProxy* CreateAutomationProxy(int execution_timeout);
+
   // Closes the browser and IPC testing server.
   void CloseBrowserAndServer();