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

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

Issue 951613004: Disable flaky test WebContentsImplBrowserTest also on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 int loadingStateToDifferentDocumentCount() const { 172 int loadingStateToDifferentDocumentCount() const {
173 return loadingStateToDifferentDocumentCount_; 173 return loadingStateToDifferentDocumentCount_;
174 } 174 }
175 175
176 private: 176 private:
177 int loadingStateChangedCount_; 177 int loadingStateChangedCount_;
178 int loadingStateToDifferentDocumentCount_; 178 int loadingStateToDifferentDocumentCount_;
179 }; 179 };
180 180
181 // See: http://crbug.com/298193 181 // See: http://crbug.com/298193
182 #if defined(OS_WIN) 182 #if defined(OS_WIN) || defined(OS_LINUX)
183 #define MAYBE_DidStopLoadingDetails DISABLED_DidStopLoadingDetails 183 #define MAYBE_DidStopLoadingDetails DISABLED_DidStopLoadingDetails
184 #else 184 #else
185 #define MAYBE_DidStopLoadingDetails DidStopLoadingDetails 185 #define MAYBE_DidStopLoadingDetails DidStopLoadingDetails
186 #endif 186 #endif
187 187
188 // Test that DidStopLoading includes the correct URL in the details. 188 // Test that DidStopLoading includes the correct URL in the details.
189 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest, 189 IN_PROC_BROWSER_TEST_F(WebContentsImplBrowserTest,
190 MAYBE_DidStopLoadingDetails) { 190 MAYBE_DidStopLoadingDetails) {
191 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 191 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
192 192
(...skipping 443 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