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

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

Issue 6268017: MultipleRealmConfirmation hangs on vista tests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
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 "chrome/browser/browser_thread.h" 9 #include "chrome/browser/browser_thread.h"
10 #include "chrome/browser/renderer_host/resource_dispatcher_host.h" 10 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 264
265 EXPECT_EQ(kMultiRealmTestRealmCount, n_handlers); 265 EXPECT_EQ(kMultiRealmTestRealmCount, n_handlers);
266 EXPECT_EQ(0, observer.auth_supplied_count_); 266 EXPECT_EQ(0, observer.auth_supplied_count_);
267 EXPECT_LT(0, observer.auth_needed_count_); 267 EXPECT_LT(0, observer.auth_needed_count_);
268 EXPECT_LT(0, observer.auth_cancelled_count_); 268 EXPECT_LT(0, observer.auth_cancelled_count_);
269 EXPECT_TRUE(test_server()->Stop()); 269 EXPECT_TRUE(test_server()->Stop());
270 } 270 }
271 271
272 // Similar to the MultipleRealmCancellation test above, but tests 272 // Similar to the MultipleRealmCancellation test above, but tests
273 // whether supplying credentials work as exepcted. 273 // whether supplying credentials work as exepcted.
274 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) { 274 #if defined(OS_WIN)
275 // See http://crbug.com/70960
276 #define MAYBE_MultipleRealmConfirmation DISABLED_MultipleRealmConfirmation
277 #else
278 #define MAYBE_MultipleRealmConfirmation MultipleRealmConfirmation
279 #endif
280 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MAYBE_MultipleRealmConfirmation) {
275 ASSERT_TRUE(test_server()->Start()); 281 ASSERT_TRUE(test_server()->Start());
276 GURL test_page = test_server()->GetURL(kMultiRealmTestPage); 282 GURL test_page = test_server()->GetURL(kMultiRealmTestPage);
277 283
278 TabContentsWrapper* contents = 284 TabContentsWrapper* contents =
279 browser()->GetSelectedTabContentsWrapper(); 285 browser()->GetSelectedTabContentsWrapper();
280 ASSERT_TRUE(contents); 286 ASSERT_TRUE(contents);
281 287
282 NavigationController* controller = &contents->controller(); 288 NavigationController* controller = &contents->controller();
283 LoginPromptBrowserTestObserver observer; 289 LoginPromptBrowserTestObserver observer;
284 290
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 EXPECT_EQ(1, n_handlers); 401 EXPECT_EQ(1, n_handlers);
396 EXPECT_LT(0, observer.auth_needed_count_); 402 EXPECT_LT(0, observer.auth_needed_count_);
397 EXPECT_EQ(0, observer.auth_cancelled_count_); 403 EXPECT_EQ(0, observer.auth_cancelled_count_);
398 EXPECT_EQ(observer.auth_needed_count_, observer.auth_supplied_count_); 404 EXPECT_EQ(observer.auth_needed_count_, observer.auth_supplied_count_);
399 LOG(INFO) << "Waiting for LOAD_STOP"; 405 LOG(INFO) << "Waiting for LOAD_STOP";
400 load_stop_waiter.Wait(); 406 load_stop_waiter.Wait();
401 EXPECT_TRUE(test_server()->Stop()); 407 EXPECT_TRUE(test_server()->Stop());
402 LOG(INFO) << "Done with test"; 408 LOG(INFO) << "Done with test";
403 } 409 }
404 } // namespace 410 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698