summaryrefslogtreecommitdiffstats
path: root/chrome/browser/page_cycler
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 18:15:48 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-18 18:15:48 +0000
commit90ca44276a89f9bee8a046270186145bb36e733e (patch)
tree87a16a5a2a1fd1ba1e79447ebb19df2309be7aeb /chrome/browser/page_cycler
parent70071b5f5e1142527db6e6e8bded0fa71eb4f260 (diff)
downloadchromium_src-90ca44276a89f9bee8a046270186145bb36e733e.zip
chromium_src-90ca44276a89f9bee8a046270186145bb36e733e.tar.gz
chromium_src-90ca44276a89f9bee8a046270186145bb36e733e.tar.bz2
Always enable dom automation for browser_tests. This avoids developers having to call EnableDOMAutomation manually, which is not evident. ui_tests used to do this automatically.
Also while at it, removed needless InProcessBrowserTest::SetUpCommandLine() calls. Review URL: https://chromiumcodereview.appspot.com/10778044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_cycler')
-rw-r--r--chrome/browser/page_cycler/page_cycler_browsertest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/page_cycler/page_cycler_browsertest.cc b/chrome/browser/page_cycler/page_cycler_browsertest.cc
index 38ce7e9..088af54 100644
--- a/chrome/browser/page_cycler/page_cycler_browsertest.cc
+++ b/chrome/browser/page_cycler/page_cycler_browsertest.cc
@@ -141,8 +141,6 @@ class PageCyclerCachedBrowserTest : public PageCyclerBrowserTest {
// For a cached test, we use the provided user data directory from the test
// directory.
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
- InProcessBrowserTest::SetUpCommandLine(command_line);
-
FilePath test_dir;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
test_dir = test_dir.AppendASCII("page_cycler");