Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Side by Side Diff: content/browser/web_contents/web_contents_impl_browsertest.cc

Issue 948023003: Disable flaky browsertest DidStopLoadingDetailsWithPending also on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "content/browser/frame_host/navigation_entry_impl.h" 7 #include "content/browser/frame_host/navigation_entry_impl.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/browser/web_contents/web_contents_view.h" 9 #include "content/browser/web_contents/web_contents_view.h"
10 #include "content/common/frame_messages.h" 10 #include "content/common/frame_messages.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html")); 195 NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
196 load_observer.Wait(); 196 load_observer.Wait();
197 197
198 EXPECT_EQ("/title1.html", load_observer.url_.path()); 198 EXPECT_EQ("/title1.html", load_observer.url_.path());
199 EXPECT_EQ(0, load_observer.session_index_); 199 EXPECT_EQ(0, load_observer.session_index_);
200 EXPECT_EQ(&shell()->web_contents()->GetController(), 200 EXPECT_EQ(&shell()->web_contents()->GetController(),
201 load_observer.controller_); 201 load_observer.controller_);
202 } 202 }
203 203
204 // See: http://crbug.com/298193 204 // See: http://crbug.com/298193
205 #if defined(OS_WIN) 205 #if defined(OS_WIN) || defined(OS_LINUX)
206 #define MAYBE_DidStopLoadingDetailsWithPending \ 206 #define MAYBE_DidStopLoadingDetailsWithPending \
207 DISABLED_DidStopLoadingDetailsWithPending 207 DISABLED_DidStopLoadingDetailsWithPending
208 #else 208 #else
209 #define MAYBE_DidStopLoadingDetailsWithPending DidStopLoadingDetailsWithPending 209 #define MAYBE_DidStopLoadingDetailsWithPending DidStopLoadingDetailsWithPending
210 #endif 210 #endif
211 211
212 // Test that DidStopLoading includes the correct URL in the details when a 212 // Test that DidStopLoading includes the correct URL in the details when a
213 // pending entry is present. 213 // pending entry is present.
214 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, 214 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
215 MAYBE_DidStopLoadingDetailsWithPending) { 215 MAYBE_DidStopLoadingDetailsWithPending) {
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 new FirstVisuallyNonEmptyPaintObserver(shell())); 636 new FirstVisuallyNonEmptyPaintObserver(shell()));
637 637
638 NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html")); 638 NavigateToURL(shell(), embedded_test_server()->GetURL("/title1.html"));
639 639
640 observer->WaitForDidFirstVisuallyNonEmptyPaint(); 640 observer->WaitForDidFirstVisuallyNonEmptyPaint();
641 ASSERT_TRUE(observer->did_fist_visually_non_empty_paint_); 641 ASSERT_TRUE(observer->did_fist_visually_non_empty_paint_);
642 } 642 }
643 643
644 } // namespace content 644 } // namespace content
645 645
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698