summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/inspector_controller_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test/ui/inspector_controller_uitest.cc')
-rw-r--r--chrome/test/ui/inspector_controller_uitest.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/test/ui/inspector_controller_uitest.cc b/chrome/test/ui/inspector_controller_uitest.cc
index 140e6f4..6bf9664 100644
--- a/chrome/test/ui/inspector_controller_uitest.cc
+++ b/chrome/test/ui/inspector_controller_uitest.cc
@@ -3,16 +3,14 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "base/no_windows2000_unittest.h"
-#include "base/win_util.h"
+#include "base/scoped_ptr.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_test.h"
#include "net/url_request/url_request_unittest.h"
-// This test does not work on win2k. See http://b/1070036
-class InspectorControllerTest : public NoWindows2000Test<UITest> {
+class InspectorControllerTest : public UITest {
protected:
TabProxy* GetActiveTabProxy() {
scoped_ptr<BrowserProxy> window_proxy(automation()->GetBrowserWindow(0));
@@ -31,9 +29,6 @@ class InspectorControllerTest : public NoWindows2000Test<UITest> {
// This test also does not work in single process. See http://b/1214920
// Disabled, see http://crbug.com/4655
TEST_F(InspectorControllerTest, DISABLED_InspectElement) {
- if (IsTestCaseDisabled())
- return;
-
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
return;