| Index: chrome/test/automation/automation_proxy_uitest.cc
|
| ===================================================================
|
| --- chrome/test/automation/automation_proxy_uitest.cc (revision 18973)
|
| +++ chrome/test/automation/automation_proxy_uitest.cc (working copy)
|
| @@ -24,6 +24,13 @@
|
| #include "net/base/net_util.h"
|
| #include "views/event.h"
|
|
|
| +// http://code.google.com/p/chromium/issues/detail?id=14943
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_NavigateToURLWithTimeout2 DISABLED_NavigateToURLWithTimeout2
|
| +#else
|
| +#define MAYBE_NavigateToURLWithTimeout2 NavigateToURLWithTimeout2
|
| +#endif
|
| +
|
| class AutomationProxyTest : public UITest {
|
| protected:
|
| AutomationProxyTest() {
|
| @@ -292,7 +299,7 @@
|
| ASSERT_TRUE(is_timeout);
|
| }
|
|
|
| -TEST_F(AutomationProxyTest, NavigateToURLWithTimeout2) {
|
| +TEST_F(AutomationProxyTest, MAYBE_NavigateToURLWithTimeout2) {
|
| scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(window.get());
|
| scoped_refptr<TabProxy> tab(window->GetTab(0));
|
|
|