summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 18:32:32 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-29 18:32:32 +0000
commitaf44e7fb02b4a5d5cd5fffcf1408a065339b7535 (patch)
treed0872f21ae0563ef4bca43f690653ab71c54ea9d /chrome/test/automation
parentcb08c583ddbe51cb99d2ee8e051bb409774e43ab (diff)
downloadchromium_src-af44e7fb02b4a5d5cd5fffcf1408a065339b7535.zip
chromium_src-af44e7fb02b4a5d5cd5fffcf1408a065339b7535.tar.gz
chromium_src-af44e7fb02b4a5d5cd5fffcf1408a065339b7535.tar.bz2
Move in_process_browser_test and ui_test_utils to chrome/test/base
BUG=90905 Review URL: http://codereview.chromium.org/7532034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc2
-rw-r--r--chrome/test/automation/dom_automation_browsertest.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 2b14cd7..c59dc1f 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -28,8 +28,8 @@
#include "chrome/test/automation/proxy_launcher.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
+#include "chrome/test/base/ui_test_utils.h"
#include "chrome/test/ui/ui_test.h"
-#include "chrome/test/ui_test_utils.h"
#include "content/browser/net/url_request_slow_http_job.h"
#include "content/common/json_value_serializer.h"
#include "net/base/host_port_pair.h"
diff --git a/chrome/test/automation/dom_automation_browsertest.cc b/chrome/test/automation/dom_automation_browsertest.cc
index 730bbe3..e8c623b 100644
--- a/chrome/test/automation/dom_automation_browsertest.cc
+++ b/chrome/test/automation/dom_automation_browsertest.cc
@@ -8,8 +8,8 @@
#include "chrome/test/automation/dom_element_proxy.h"
#include "chrome/test/automation/javascript_execution_controller.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
namespace {