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

37 files changed, 27 insertions, 104 deletions

diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 58790d4..b9effff 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -23,7 +23,6 @@ class AppControllerPlatformAppBrowserTest : public InProcessBrowserTest {
   AppControllerPlatformAppBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kAppId,
                                     "1234");
   }
@@ -48,9 +47,7 @@ class AppControllerWebAppBrowserTest : public InProcessBrowserTest {
   AppControllerWebAppBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitchASCII(switches::kApp,
-                                    GetAppURL());
+    command_line->AppendSwitchASCII(switches::kApp, GetAppURL());
   }
 
   std::string GetAppURL() const {
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 830693a..77a8276 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -101,9 +101,7 @@ class WindowedPersonalDataManagerObserver : public PersonalDataManagerObserver {
 
 class AutofillTest : public InProcessBrowserTest {
  protected:
-  AutofillTest() {
-    EnableDOMAutomation();
-  }
+  AutofillTest() {}
 
   void CreateTestProfile() {
     autofill_test::DisableSystemServices(browser()->profile());
diff --git a/chrome/browser/automation/automation_misc_browsertest.cc b/chrome/browser/automation/automation_misc_browsertest.cc
index 4b01de4..e8be2cb 100644
--- a/chrome/browser/automation/automation_misc_browsertest.cc
+++ b/chrome/browser/automation/automation_misc_browsertest.cc
@@ -22,11 +22,9 @@
 
 class AutomationMiscBrowserTest : public InProcessBrowserTest {
  public:
-  AutomationMiscBrowserTest() {
-    EnableDOMAutomation();
-  }
+  AutomationMiscBrowserTest() {}
 
-  virtual ~AutomationMiscBrowserTest() { }
+  virtual ~AutomationMiscBrowserTest() {}
 };
 
 class MockMouseEventCallback {
diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc
index fa7ba87..5a1c015 100644
--- a/chrome/browser/automation/automation_tab_helper_browsertest.cc
+++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc
@@ -53,10 +53,8 @@ class MockNotificationObserver : public content::NotificationObserver {
 
 class AutomationTabHelperBrowserTest : public InProcessBrowserTest {
  public:
-  AutomationTabHelperBrowserTest() {
-    EnableDOMAutomation();
-  }
-  virtual ~AutomationTabHelperBrowserTest() { }
+  AutomationTabHelperBrowserTest() {}
+  virtual ~AutomationTabHelperBrowserTest() {}
 
   void SetUpInProcessBrowserTestFixture() {
     EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index bff8632..946381f 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -159,9 +159,7 @@ class BrowserFocusTest : public InProcessBrowserTest {
 #else
       location_bar_focus_view_id_(VIEW_ID_LOCATION_BAR)
 #endif
-  {
-    EnableDOMAutomation();
-  }
+  {}
 
   bool IsViewFocused(ViewID vid) {
     return ui_test_utils::IsViewFocused(browser(), vid);
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index 7f0d3cc..5eb0f47 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -128,9 +128,7 @@ class TestFinishObserver : public content::NotificationObserver {
 
 class BrowserKeyEventsTest : public InProcessBrowserTest {
  public:
-  BrowserKeyEventsTest() {
-    EnableDOMAutomation();
-  }
+  BrowserKeyEventsTest() {}
 
   bool IsViewFocused(ViewID vid) {
     return ui_test_utils::IsViewFocused(browser(), vid);
diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc
index 1e68680..f038218 100644
--- a/chrome/browser/chrome_switches_browsertest.cc
+++ b/chrome/browser/chrome_switches_browsertest.cc
@@ -13,9 +13,7 @@
 
 class HostRulesTest : public InProcessBrowserTest {
  protected:
-  HostRulesTest() {
-    EnableDOMAutomation();
-  }
+  HostRulesTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ASSERT_TRUE(test_server()->Start());
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc
index de18e2e..dab1fdc 100644
--- a/chrome/browser/content_settings/content_settings_browsertest.cc
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -83,9 +83,7 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectCrossOrigin) {
 
 class ClickToPlayPluginTest : public InProcessBrowserTest {
  public:
-  ClickToPlayPluginTest() {
-    EnableDOMAutomation();
-  }
+  ClickToPlayPluginTest() {}
 
 #if defined(OS_MACOSX)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/debugger/devtools_sanity_browsertest.cc
index aa5ffa6..7cb6d2f 100644
--- a/chrome/browser/debugger/devtools_sanity_browsertest.cc
+++ b/chrome/browser/debugger/devtools_sanity_browsertest.cc
@@ -122,9 +122,7 @@ class DevToolsSanityTest : public InProcessBrowserTest {
  public:
   DevToolsSanityTest()
       : window_(NULL),
-        inspected_rvh_(NULL) {
-    EnableDOMAutomation();
-  }
+        inspected_rvh_(NULL) {}
 
  protected:
   void RunTest(const std::string& test_name, const std::string& test_page) {
@@ -270,9 +268,7 @@ class DevToolsExperimentalExtensionTest : public DevToolsExtensionTest {
 
 class WorkerDevToolsSanityTest : public InProcessBrowserTest {
  public:
-  WorkerDevToolsSanityTest() : window_(NULL) {
-    EnableDOMAutomation();
-  }
+  WorkerDevToolsSanityTest() : window_(NULL) {}
 
  protected:
   class WorkerData : public base::RefCountedThreadSafe<WorkerData> {
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index fcb405b..4585d77 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -274,9 +274,7 @@ class DownloadTest : public InProcessBrowserTest {
     content::TestFileErrorInjector::FileErrorInfo error_info;
   };
 
-  DownloadTest() {
-    EnableDOMAutomation();
-  }
+  DownloadTest() {}
 
   void SetUpOnMainThread() OVERRIDE {
     BrowserThread::PostTask(
diff --git a/chrome/browser/extensions/api/record/record_api_test.cc b/chrome/browser/extensions/api/record/record_api_test.cc
index 9dfed9a..f5260c7 100644
--- a/chrome/browser/extensions/api/record/record_api_test.cc
+++ b/chrome/browser/extensions/api/record/record_api_test.cc
@@ -196,7 +196,6 @@ class RecordApiTest : public InProcessBrowserTest {
   // should be replaced.  Clear record-mode, playback-mode, visit-urls,
   // record-stats, and load-extension.
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
     std::vector<std::string> remove_switches;
 
     remove_switches.push_back(switches::kUserDataDir);
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 40652e9..98bf5e2 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -56,9 +56,6 @@ ExtensionBrowserTest::~ExtensionBrowserTest() {
 }
 
 void ExtensionBrowserTest::SetUpCommandLine(CommandLine* command_line) {
-  // This enables DOM automation for tab contentses.
-  EnableDOMAutomation();
-
   extensions::Feature::SetChannelForTesting(
       chrome::VersionInfo::CHANNEL_UNKNOWN);
 
diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc
index 48db269..6ec1809 100644
--- a/chrome/browser/extensions/extension_nacl_browsertest.cc
+++ b/chrome/browser/extensions/extension_nacl_browsertest.cc
@@ -33,9 +33,7 @@ const char* kExtensionId = "bjjcibdiodkkeanflmiijlcfieiemced";
 // .nexe is part of an extension from the Chrome Webstore.
 class NaClExtensionTest : public ExtensionBrowserTest {
  public:
-  NaClExtensionTest() {
-    EnableDOMAutomation();
-  }
+  NaClExtensionTest() {}
 
  protected:
   enum InstallType {
diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc
index 7cfd2e0..7de10c6 100644
--- a/chrome/browser/extensions/extension_startup_browsertest.cc
+++ b/chrome/browser/extensions/extension_startup_browsertest.cc
@@ -38,8 +38,6 @@ class ExtensionStartupTestBase : public InProcessBrowserTest {
  protected:
   // InProcessBrowserTest
   virtual void SetUpCommandLine(CommandLine* command_line) {
-    EnableDOMAutomation();
-
     if (!enable_extensions_)
       command_line->AppendSwitch(switches::kDisableExtensions);
 
diff --git a/chrome/browser/extensions/webstore_inline_install_browsertest.cc b/chrome/browser/extensions/webstore_inline_install_browsertest.cc
index 62256fe..55a5a6f 100644
--- a/chrome/browser/extensions/webstore_inline_install_browsertest.cc
+++ b/chrome/browser/extensions/webstore_inline_install_browsertest.cc
@@ -32,14 +32,10 @@ const char kNonAppDomain[] = "nonapp.com";
 class WebstoreInlineInstallTest : public InProcessBrowserTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    EnableDOMAutomation();
-
     // We start the test server now instead of in
     // SetUpInProcessBrowserTestFixture so that we can get its port number.
     ASSERT_TRUE(test_server()->Start());
 
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-
     net::HostPortPair host_port = test_server()->host_port_pair();
     test_gallery_url_ = base::StringPrintf(
         "http://%s:%d/files/extensions/api_test/webstore_inline_install",
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc
index e9aaa1e..7d3b0d0 100644
--- a/chrome/browser/geolocation/geolocation_browsertest.cc
+++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -207,9 +207,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest {
       html_for_tests_("files/geolocation/simple.html"),
       fake_latitude_(1.23),
       fake_longitude_(4.56),
-      started_test_server_(false) {
-    EnableDOMAutomation();
-  }
+      started_test_server_(false) {}
 
   // InProcessBrowserTest
   virtual void SetUpOnMainThread() {
diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc
index 799b722..190af06 100644
--- a/chrome/browser/instant/instant_browsertest.cc
+++ b/chrome/browser/instant/instant_browsertest.cc
@@ -52,9 +52,7 @@ using content::WebContents;
 
 class InstantTest : public InProcessBrowserTest {
  public:
-  InstantTest() {
-    EnableDOMAutomation();
-  }
+  InstantTest() {}
 
   void EnableInstant() {
     InstantController::Enable(browser()->profile());
diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
index d1385b0..04af223 100644
--- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc
+++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
@@ -11,9 +11,7 @@
 
 class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
  public:
-  LoadtimesExtensionBindingsTest() {
-    EnableDOMAutomation();
-  }
+  LoadtimesExtensionBindingsTest() {}
 
   void CompareBeforeAndAfter() {
     // TODO(simonjam): There's a race on whether or not first paint is populated
diff --git a/chrome/browser/net/load_timing_observer_browsertest.cc b/chrome/browser/net/load_timing_observer_browsertest.cc
index e080681..430f369 100644
--- a/chrome/browser/net/load_timing_observer_browsertest.cc
+++ b/chrome/browser/net/load_timing_observer_browsertest.cc
@@ -12,11 +12,7 @@
 
 class LoadTimingObserverTest : public InProcessBrowserTest {
  public:
-  LoadTimingObserverTest() {
-    EnableDOMAutomation();
-  }
-
- protected:
+  LoadTimingObserverTest() {}
 };
 
 // http://crbug.com/102030
diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc
index da1b5bd..e8e1e90 100644
--- a/chrome/browser/notifications/notification_browsertest.cc
+++ b/chrome/browser/notifications/notification_browsertest.cc
@@ -14,9 +14,7 @@
 
 class NotificationsPermissionTest : public InProcessBrowserTest {
  public:
-  NotificationsPermissionTest() {
-    EnableDOMAutomation();
-  }
+  NotificationsPermissionTest() {}
 };
 
 // If this flakes, use http://crbug.com/62311 and http://crbug.com/74428.
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");
diff --git a/chrome/browser/prerender/prefetch_browsertest.cc b/chrome/browser/prerender/prefetch_browsertest.cc
index 87c8349..d104b9e 100644
--- a/chrome/browser/prerender/prefetch_browsertest.cc
+++ b/chrome/browser/prerender/prefetch_browsertest.cc
@@ -17,9 +17,7 @@ const char kPrefetchPage[] = "files/prerender/simple_prefetch.html";
 class PrefetchBrowserTestBase : public InProcessBrowserTest {
  public:
   explicit PrefetchBrowserTestBase(bool do_prefetching)
-      : InProcessBrowserTest(), do_prefetching_(do_prefetching) {
-    EnableDOMAutomation();
-  }
+      : do_prefetching_(do_prefetching) {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     if (do_prefetching_) {
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index b941c1d..59286c4 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -511,9 +511,7 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
         use_https_src_server_(false),
         call_javascript_(true),
         loader_path_("files/prerender/prerender_loader.html"),
-        explicitly_set_browser_(NULL) {
-    EnableDOMAutomation();
-  }
+        explicitly_set_browser_(NULL) {}
 
   virtual ~PrerenderBrowserTest() {}
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index d2a57f0..6f78a50 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -773,8 +773,6 @@ class SafeBrowsingServiceCookieTest : public InProcessBrowserTest {
   SafeBrowsingServiceCookieTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-
     // We need to start the test server to get the host&port in the url.
     ASSERT_TRUE(test_server()->Start());
 
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 79b43a8..99de039 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -87,9 +87,7 @@ class SSLUITest : public InProcessBrowserTest {
             HTTPSOptions(HTTPSOptions::CERT_EXPIRED), FilePath(kDocRoot)),
         https_server_mismatched_(
             HTTPSOptions(HTTPSOptions::CERT_MISMATCHED_NAME),
-            FilePath(kDocRoot)) {
-    EnableDOMAutomation();
-  }
+            FilePath(kDocRoot)) {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) {
     // Browser will both run and display insecure content.
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index b167e13..18c39b0 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -70,8 +70,6 @@ const int kMoveIterations = 30;
 class FindInPageControllerTest : public InProcessBrowserTest {
  public:
   FindInPageControllerTest() {
-    EnableDOMAutomation();
-
 #if defined(TOOLKIT_VIEWS)
     DropdownBarHost::disable_animations_during_testing_ = true;
 #elif defined(TOOLKIT_GTK)
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
index 2a9ccbb..4ad110f 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc
@@ -20,7 +20,6 @@ const char FullscreenControllerTest::kFullscreenMouseLockHTML[] =
     "files/fullscreen_mouselock/fullscreen_mouselock.html";
 
 void FullscreenControllerTest::SetUpCommandLine(CommandLine* command_line) {
-  InProcessBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnablePointerLock);
 }
 
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index 76da44cc..302e299 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -208,8 +208,6 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
     // SetUpInProcessBrowserTestFixture so that we can get its port number.
     ASSERT_TRUE(test_server()->Start());
 
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-
     net::HostPortPair host_port = test_server()->host_port_pair();
     command_line->AppendSwitchASCII(
         switches::kAppsGalleryDownloadURL,
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index dfc2c31..ad0bd63 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -218,7 +218,6 @@ bool BasePanelBrowserTest::SkipTestIfCompizWM() {
 }
 
 void BasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) {
-  EnableDOMAutomation();
   command_line->AppendSwitch(switches::kEnablePanels);
 }
 
diff --git a/chrome/browser/ui/panels/old_base_panel_browser_test.cc b/chrome/browser/ui/panels/old_base_panel_browser_test.cc
index 70fc0f0..938b130 100644
--- a/chrome/browser/ui/panels/old_base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/old_base_panel_browser_test.cc
@@ -220,7 +220,6 @@ bool OldBasePanelBrowserTest::SkipTestIfCompizWM() {
 }
 
 void OldBasePanelBrowserTest::SetUpCommandLine(CommandLine* command_line) {
-  EnableDOMAutomation();
   command_line->AppendSwitch(switches::kEnablePanels);
 }
 
diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc
index d7ffd2b..c4e0ec6 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest.cc
+++ b/chrome/browser/ui/pdf/pdf_browsertest.cc
@@ -43,8 +43,6 @@ class PDFBrowserTest : public InProcessBrowserTest,
       : snapshot_different_(true),
         next_dummy_search_value_(0),
         load_stop_notification_count_(0) {
-    EnableDOMAutomation();
-
     pdf_test_server_.reset(new net::TestServer(
         net::TestServer::TYPE_HTTP,
         net::TestServer::kLocalhost,
diff --git a/chrome/browser/ui/views/keyboard_access_browsertest.cc b/chrome/browser/ui/views/keyboard_access_browsertest.cc
index b5e646a..5d480e5 100644
--- a/chrome/browser/ui/views/keyboard_access_browsertest.cc
+++ b/chrome/browser/ui/views/keyboard_access_browsertest.cc
@@ -101,9 +101,7 @@ class SendKeysMenuListener : public views::MenuListener {
 
 class KeyboardAccessTest : public InProcessBrowserTest {
  public:
-  KeyboardAccessTest() {
-    EnableDOMAutomation();
-  }
+  KeyboardAccessTest() {}
 
   // Use the keyboard to select "New Tab" from the app menu.
   // This test depends on the fact that there is one menu and that
diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
index 8b7c72f..9c6ce4b 100644
--- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc
@@ -17,9 +17,7 @@
 
 class BookmarksTest : public InProcessBrowserTest {
  public:
-  BookmarksTest() {
-    EnableDOMAutomation();
-  }
+  BookmarksTest() {}
 
   void OpenBookmarksManager() {
     content::TestNavigationObserver navigation_observer(
diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
index ccfc045..10e379d 100644
--- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
@@ -21,9 +21,7 @@ const char kSharedWorkerJs[] =
 
 class InspectUITest : public InProcessBrowserTest {
  public:
-  InspectUITest() {
-    EnableDOMAutomation();
-  }
+  InspectUITest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(InspectUITest);
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
index 5fb1892..788c237 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc
@@ -22,9 +22,7 @@ using content::Referrer;
 
 class NewTabUIBrowserTest : public InProcessBrowserTest {
  public:
-  NewTabUIBrowserTest() {
-    EnableDOMAutomation();
-  }
+  NewTabUIBrowserTest() {}
 };
 
 // Ensure that chrome-internal: still loads the NTP.
diff --git a/chrome/browser/ui/webui/options2/options_ui_browsertest.cc b/chrome/browser/ui/webui/options2/options_ui_browsertest.cc
index ad9fdb1..9c6b0b5 100644
--- a/chrome/browser/ui/webui/options2/options_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/options2/options_ui_browsertest.cc
@@ -17,7 +17,6 @@
 namespace options2 {
 
 OptionsBrowserTest::OptionsBrowserTest() {
-  EnableDOMAutomation();
 }
 
 void OptionsBrowserTest::NavigateToSettings() {
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
index 1cc0692..9e91435 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -18,9 +18,7 @@ namespace {
 
 class PrintPreviewTest : public InProcessBrowserTest {
  public:
-  PrintPreviewTest() {
-    EnableDOMAutomation();
-  }
+  PrintPreviewTest() {}
 
 #if !defined(GOOGLE_CHROME_BUILD)
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {