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

Side by Side Diff: chrome/browser/ui/login/login_prompt_browsertest.cc

Issue 8581001: Re-enable LoginPromptBrowserTest.MultipleRealmConfirmation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <algorithm> 5 #include <algorithm>
6 #include <list> 6 #include <list>
7 #include <map> 7 #include <map>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/prerender/prerender_manager.h" 10 #include "chrome/browser/prerender/prerender_manager.h"
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 397
398 EXPECT_EQ(kMultiRealmTestRealmCount, n_handlers); 398 EXPECT_EQ(kMultiRealmTestRealmCount, n_handlers);
399 EXPECT_EQ(0, observer.auth_supplied_count_); 399 EXPECT_EQ(0, observer.auth_supplied_count_);
400 EXPECT_LT(0, observer.auth_needed_count_); 400 EXPECT_LT(0, observer.auth_needed_count_);
401 EXPECT_LT(0, observer.auth_cancelled_count_); 401 EXPECT_LT(0, observer.auth_cancelled_count_);
402 EXPECT_TRUE(test_server()->Stop()); 402 EXPECT_TRUE(test_server()->Stop());
403 } 403 }
404 404
405 // Similar to the MultipleRealmCancellation test above, but tests 405 // Similar to the MultipleRealmCancellation test above, but tests
406 // whether supplying credentials work as exepcted. 406 // whether supplying credentials work as exepcted.
407 #if defined(OS_WIN) 407 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) {
408 // See http://crbug.com/70960
409 #define MAYBE_MultipleRealmConfirmation DISABLED_MultipleRealmConfirmation
410 #else
411 #define MAYBE_MultipleRealmConfirmation MultipleRealmConfirmation
412 #endif
413 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
414 MAYBE_MultipleRealmConfirmation) {
415 ASSERT_TRUE(test_server()->Start()); 408 ASSERT_TRUE(test_server()->Start());
416 GURL test_page = test_server()->GetURL(kMultiRealmTestPage); 409 GURL test_page = test_server()->GetURL(kMultiRealmTestPage);
417 410
418 TabContentsWrapper* contents = 411 TabContentsWrapper* contents =
419 browser()->GetSelectedTabContentsWrapper(); 412 browser()->GetSelectedTabContentsWrapper();
420 ASSERT_TRUE(contents); 413 ASSERT_TRUE(contents);
421 414
422 NavigationController* controller = &contents->controller(); 415 NavigationController* controller = &contents->controller();
423 LoginPromptBrowserTestObserver observer; 416 LoginPromptBrowserTestObserver observer;
424 417
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 handler->CancelAuth(); 642 handler->CancelAuth();
650 auth_cancelled_waiter.Wait(); 643 auth_cancelled_waiter.Wait();
651 } 644 }
652 } 645 }
653 646
654 EXPECT_EQ(1, observer.auth_needed_count_); 647 EXPECT_EQ(1, observer.auth_needed_count_);
655 EXPECT_TRUE(test_server()->Stop()); 648 EXPECT_TRUE(test_server()->Stop());
656 } 649 }
657 650
658 } // namespace 651 } // namespace
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