diff options
| author | kustermann <kustermann@google.com> | 2014-10-14 06:06:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-14 13:06:46 +0000 |
| commit | 0c972cb5f080fff7b82b86a4445f0faa4393bbc2 (patch) | |
| tree | a814c41f4e7adb5ce37d5e7273f244f75fd4aa0d /extensions/browser/guest_view | |
| parent | f5a59db3377b727b61f3cc6d18c9a921320d75bb (diff) | |
| download | chromium_src-0c972cb5f080fff7b82b86a4445f0faa4393bbc2.zip chromium_src-0c972cb5f080fff7b82b86a4445f0faa4393bbc2.tar.gz chromium_src-0c972cb5f080fff7b82b86a4445f0faa4393bbc2.tar.bz2 | |
Attempt to fix flaky ChromeOS test timeouts.
Bisecting the UserAddingScreenTest.ScreenVisibility test timeouts
seems to have identified the causing CL.
This reverts the causing CL
4c6917e303938f0be7beb244abdfbf4723c2162f -- "cc:: Remove SwapAck throttling from Scheduler."
and enables tests again:
reverts 497a57a9b9c372cd58e3e1261d79916e4ca247c2 -- "Disable flaky timeout InlineLoginUIBrowserTest.DifferentStorageId on linux"
reverts ffc3747adcd49ca0185670dd6bc78078b4721544 -- "Disable WebViewAPITest.AcceptTouchEvents on Linux."
reverts efbbf859cec94c1a8d671499d190158fbdce3599 -- "Disabling UserImageManagerTest.SaveUserImageFromProfileImage.".
reverts f827c03bbf5971e2f24e32bd90ce4c40f5ee8f1c -- "Disable SharedOptionsTest.ScreenLockPreferencePrimary."
reverts 6e402f141ae341c5df18ca81e892089c47fae54f -- "Disable PreferencesTest.MultiProfiles."
reverts d65f70589ef04c62678b3e96d674689cbd3fd0c2 -- "Disable NetworkPortalDetectorImplBrowserTest.InSessionDetection."
BUG=423332,423094,423077,423053,423015,422998,422868
TBR=orglofch
Review URL: https://codereview.chromium.org/655783002
Cr-Commit-Position: refs/heads/master@{#299468}
Diffstat (limited to 'extensions/browser/guest_view')
| -rw-r--r-- | extensions/browser/guest_view/web_view/web_view_apitest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index e7c3dbe..bad7930 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc @@ -271,13 +271,7 @@ content::WebContents* WebViewAPITest::GetGuestWebContents() { return GetGuestViewManager()->WaitForSingleGuestCreated(); } -// Occasionally hits NOTIMPLEMENTED on Linux. https://crbug.com/422998 -#if defined(OS_LINUX) -#define MAYBE_AcceptTouchEvents DISABLED_AcceptTouchEvents -#else -#define MAYBE_AcceptTouchEvents AcceptTouchEvents -#endif -IN_PROC_BROWSER_TEST_F(WebViewAPITest, MAYBE_AcceptTouchEvents) { +IN_PROC_BROWSER_TEST_F(WebViewAPITest, AcceptTouchEvents) { LaunchApp("web_view/accept_touch_events"); content::RenderViewHost* embedder_rvh = |