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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 11348375: Remove FLAKY prefix from WebNavigationApiTest.ServerRedirectSingleProcess (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
« 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <list> 5 #include <list>
6 #include <set> 6 #include <set>
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 RunExtensionSubtest("webnavigation", "test_clientRedirect.html")) 395 RunExtensionSubtest("webnavigation", "test_clientRedirect.html"))
396 << message_; 396 << message_;
397 } 397 }
398 398
399 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirect) { 399 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirect) {
400 ASSERT_TRUE( 400 ASSERT_TRUE(
401 RunExtensionSubtest("webnavigation", "test_serverRedirect.html")) 401 RunExtensionSubtest("webnavigation", "test_serverRedirect.html"))
402 << message_; 402 << message_;
403 } 403 }
404 404
405 #if defined(OS_WIN) 405 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirectSingleProcess) {
406 // http://crbug.com/161897
407 #define MAYBE_ServerRedirectSingleProcess FLAKY_ServerRedirectSingleProcess
408 #else
409 #define MAYBE_ServerRedirectSingleProcess ServerRedirectSingleProcess
410 #endif
411 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest,
412 MAYBE_ServerRedirectSingleProcess) {
413 // Set max renderers to 1 to force running out of processes. 406 // Set max renderers to 1 to force running out of processes.
414 content::RenderProcessHost::SetMaxRendererProcessCount(1); 407 content::RenderProcessHost::SetMaxRendererProcessCount(1);
415 408
416 // Wait for the extension to set itself up and return control to us. 409 // Wait for the extension to set itself up and return control to us.
417 ASSERT_TRUE(RunExtensionSubtest( 410 ASSERT_TRUE(RunExtensionSubtest(
418 "webnavigation", "test_serverRedirectSingleProcess.html")) 411 "webnavigation", "test_serverRedirectSingleProcess.html"))
419 << message_; 412 << message_;
420 413
421 WebContents* tab = chrome::GetActiveWebContents(browser()); 414 WebContents* tab = chrome::GetActiveWebContents(browser());
422 content::WaitForLoadStop(tab); 415 content::WaitForLoadStop(tab);
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
689 test_server()->GetURL("test6"), 682 test_server()->GetURL("test6"),
690 "updateHistory()", 683 "updateHistory()",
691 extension->GetResourceURL("crossProcess/empty.html")); 684 extension->GetResourceURL("crossProcess/empty.html"));
692 685
693 ASSERT_TRUE(RunPageTest( 686 ASSERT_TRUE(RunPageTest(
694 extension->GetResourceURL("test_crossProcessHistory.html").spec())) 687 extension->GetResourceURL("test_crossProcessHistory.html").spec()))
695 << message_; 688 << message_;
696 } 689 }
697 690
698 } // namespace extensions 691 } // namespace extensions
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