diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-20 21:06:37 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-20 21:06:37 +0000 |
commit | d7fa75524ad63cb7d6a5e059dab31fcf1d779acb (patch) | |
tree | 3404cfee8bbdbb05532b5a5c66c5512ffdc20304 | |
parent | 4beb1521b481adfccda995ab1ffa4eb95ca85182 (diff) | |
download | chromium_src-d7fa75524ad63cb7d6a5e059dab31fcf1d779acb.zip chromium_src-d7fa75524ad63cb7d6a5e059dab31fcf1d779acb.tar.gz chromium_src-d7fa75524ad63cb7d6a5e059dab31fcf1d779acb.tar.bz2 |
Enable first UI test on Linux (browser/images_uitest.cc)
- less things #ifdef-ed
- replaced Windows-specific functions with portable equivalents
Review URL: http://codereview.chromium.org/50059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12213 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/automation/automation_provider.cc | 2 | ||||
-rw-r--r-- | chrome/browser/images_uitest.cc | 3 | ||||
-rw-r--r-- | chrome/chrome.gyp | 1 | ||||
-rw-r--r-- | chrome/test/ui/ui_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/ui/ui_tests.scons | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 4ea5e283..94cb54f 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -813,8 +813,10 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) { WindowSimulateKeyPress) IPC_MESSAGE_HANDLER_DELAY_REPLY(AutomationMsg_WindowDrag, WindowSimulateDrag) +#endif // defined(OS_WIN) IPC_MESSAGE_HANDLER(AutomationMsg_TabCount, GetTabCount) IPC_MESSAGE_HANDLER(AutomationMsg_Tab, GetTab) +#if defined(OS_WIN) IPC_MESSAGE_HANDLER(AutomationMsg_TabHWND, GetTabHWND) #endif // defined(OS_WIN) IPC_MESSAGE_HANDLER(AutomationMsg_TabProcessID, GetTabProcessID) diff --git a/chrome/browser/images_uitest.cc b/chrome/browser/images_uitest.cc index c6452b4..59dffda 100644 --- a/chrome/browser/images_uitest.cc +++ b/chrome/browser/images_uitest.cc @@ -4,6 +4,7 @@ #include "base/basictypes.h" #include "base/file_util.h" +#include "base/platform_thread.h" #include "chrome/test/ui/ui_test.h" class ImagesTest : public UITest { @@ -21,7 +22,7 @@ TEST_F(ImagesTest, AnimatedGIFs) { // Let the GIFs fully animate. for (int i = 0; i < 10; ++i) { - Sleep(sleep_timeout_ms()); + PlatformThread::Sleep(sleep_timeout_ms()); if (page_title == GetActiveTabTitle()) break; } diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index bc3628a..17e0d61 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1866,7 +1866,6 @@ 'browser/download/save_page_uitest.cc', 'browser/errorpage_uitest.cc', 'browser/iframe_uitest.cc', - 'browser/images_uitest.cc', 'browser/interstitial_page_uitest.cc', 'browser/login_prompt_uitest.cc', 'browser/metrics/metrics_service_uitest.cc', diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index dc8b3ec..72d24b7 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -544,6 +544,7 @@ bool UITest::WaitForBookmarkBarVisibilityChange(BrowserProxy* browser, } return false; } +#endif // defined(OS_WIN) GURL UITest::GetActiveTabURL() { scoped_ptr<TabProxy> tab_proxy(GetActiveTab()); @@ -565,7 +566,6 @@ std::wstring UITest::GetActiveTabTitle() { EXPECT_TRUE(tab_proxy->GetTabTitle(&title)); return title; } -#endif // defined(OS_WIN) bool UITest::IsBrowserRunning() { return CrashAwareSleep(0); diff --git a/chrome/test/ui/ui_tests.scons b/chrome/test/ui/ui_tests.scons index c5b757c..c282092 100644 --- a/chrome/test/ui/ui_tests.scons +++ b/chrome/test/ui/ui_tests.scons @@ -252,7 +252,6 @@ if not env.Bit('windows'): '$CHROME_DIR/browser/errorpage_uitest.cc', '$CHROME_DIR/browser/history/redirect_uitest.cc', '$CHROME_DIR/browser/iframe_uitest.cc', - '$CHROME_DIR/browser/images_uitest.cc', '$CHROME_DIR/browser/interstitial_page_uitest.cc', '$CHROME_DIR/browser/locale_tests_uitest.cc', '$CHROME_DIR/browser/login_prompt_uitest.cc', |