diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 14:35:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-23 14:35:35 +0000 |
| commit | e28c2cf908cf2e232329ce9431b68a4b8e4287a6 (patch) | |
| tree | 53f67285c1a7e3c744803d51ece6d666e44c539a /chrome/test/ui/inspector_controller_uitest.cc | |
| parent | a9329fff10db68e6612fb804ec906b5cc2f418fd (diff) | |
| download | chromium_src-e28c2cf908cf2e232329ce9431b68a4b8e4287a6.zip chromium_src-e28c2cf908cf2e232329ce9431b68a4b8e4287a6.tar.gz chromium_src-e28c2cf908cf2e232329ce9431b68a4b8e4287a6.tar.bz2 | |
Port more UI tests to Linux.
- enable following ui tests on Linux:
history_uitest.cc
inspector_controller_uitest.cc
browser/history/redirect_uitest.cc
browser/locale_tests_uitest.cc
browser/sanity_uitest.cc
- move information about Linux-specific splash page
to more generic location and enable more logic
about start page on Linux
- maintainability cleanups (DISABLED_ instead of #if 0)
- misc GCC-related cleanups
Review URL: http://codereview.chromium.org/49006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/inspector_controller_uitest.cc')
| -rw-r--r-- | chrome/test/ui/inspector_controller_uitest.cc | 9 |
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; |