diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 23:26:41 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-15 23:26:41 +0000 |
| commit | 373b461d7b32ca0dbcc65cfb3eb7bbac90c12b07 (patch) | |
| tree | b31d4f93ab4ada083a73f8926b2e44ac23027a6c | |
| parent | ece20774acb6f87ddee1958d60601f6317f78f2d (diff) | |
| download | chromium_src-373b461d7b32ca0dbcc65cfb3eb7bbac90c12b07.zip chromium_src-373b461d7b32ca0dbcc65cfb3eb7bbac90c12b07.tar.gz chromium_src-373b461d7b32ca0dbcc65cfb3eb7bbac90c12b07.tar.bz2 | |
Disable InProcessBrowserTest.PRE_TranslateSessionRestore on Win
TBR=jam@chromium.org
BUG=166334
Review URL: https://codereview.chromium.org/11590004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173343 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/translate/translate_manager_browsertest.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 839d756..51c74ba 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -1488,9 +1488,16 @@ TEST_F(TranslateManagerTest, DownloadsAndHistoryNotTranslated) { GURL(chrome::kChromeUIHistoryURL))); } +// Test is flaky on Win http://crbug.com/166334 +#if defined(OS_WIN) +#define MAYBE_PRE_TranslateSessionRestore DISABLED_PRE_TranslateSessionRestore +#else +#define MAYBE_PRE_TranslateSessionRestore PRE_TranslateSessionRestore +#endif // Test that session restore restores the translate infobar and other translate // settings. -IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, PRE_TranslateSessionRestore) { +IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, + MAYBE_PRE_TranslateSessionRestore) { SessionStartupPref pref(SessionStartupPref::LAST); SessionStartupPref::SetStartupPref(browser()->profile(), pref); @@ -1514,7 +1521,12 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, PRE_TranslateSessionRestore) { EXPECT_EQ("fr", translate_tab_helper->language_state().original_language()); } -IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, TranslateSessionRestore) { +#if defined (OS_WIN) +#define MAYBE_TranslateSessionRestore DISABLED_TranslateSessionRestore +#else +#define MAYBE_TranslateSessionRestore TranslateSessionRestore +#endif +IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, MAYBE_TranslateSessionRestore) { WebContents* current_web_contents = chrome::GetActiveWebContents(browser()); content::Source<WebContents> source(current_web_contents); |