summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 13:53:58 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-25 13:53:58 +0000
commit856c26be2a9a419033f93d79ba9ee43e04b20458 (patch)
treefc8500a743642ee3465c3d6a79338290a7d911de /chrome/browser
parentbbdd97bbc006c4ecba801d604e720883a9c0f0ce (diff)
downloadchromium_src-856c26be2a9a419033f93d79ba9ee43e04b20458.zip
chromium_src-856c26be2a9a419033f93d79ba9ee43e04b20458.tar.gz
chromium_src-856c26be2a9a419033f93d79ba9ee43e04b20458.tar.bz2
DevTools: Enable devtools sanity tests on Linux.
Review URL: http://codereview.chromium.org/174395 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc16
1 files changed, 4 insertions, 12 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 4d08640..bb38583 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -16,15 +16,6 @@
#include "chrome/test/ui_test_utils.h"
-#if defined(OS_WIN)
-#define MAYBE_TestShowScriptsTab DISABLED_TestShowScriptsTab
-#define MAYBE_TestSetBreakpoint TestSetBreakpoint
-#elif defined(OS_LINUX)
-// http://crbug.com/19748
-#define MAYBE_TestShowScriptsTab DISABLED_TestShowScriptsTab
-#define MAYBE_TestSetBreakpoint DISABLED_TestSetBreakpoint
-#endif
-
namespace {
// Used to block until a dev tools client window's browser is closed.
@@ -55,6 +46,7 @@ const wchar_t kConsoleTestPage[] = L"files/devtools/console_test_page.html";
const wchar_t kDebuggerTestPage[] = L"files/devtools/debugger_test_page.html";
const wchar_t kEvalTestPage[] = L"files/devtools/eval_test_page.html";
const wchar_t kJsPage[] = L"files/devtools/js_page.html";
+const wchar_t kResourceTestPage[] = L"files/devtools/resource_test_page.html";
const wchar_t kSimplePage[] = L"files/devtools/simple_page.html";
class DevToolsSanityTest : public InProcessBrowserTest {
@@ -149,7 +141,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) {
// Tests resource headers.
IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestResourceHeaders) {
- RunTest("testResourceHeaders", kDebuggerTestPage);
+ RunTest("testResourceHeaders", kResourceTestPage);
}
// Tests profiler panel.
@@ -159,13 +151,13 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) {
// Tests scripts panel showing.
// http://crbug.com/16767
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestShowScriptsTab) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
RunTest("testShowScriptsTab", kDebuggerTestPage);
}
// Tests set breakpoint.
// http://crbug.com/16767
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestSetBreakpoint) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestSetBreakpoint) {
RunTest("testSetBreakpoint", kDebuggerTestPage);
}