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

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

Issue 12183030: Revert cross-origin auth prompt blocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | 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 <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 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 load_stop_waiter.Wait(); 747 load_stop_waiter.Wait();
748 } 748 }
749 749
750 EXPECT_EQ(0, observer.auth_supplied_count_); 750 EXPECT_EQ(0, observer.auth_supplied_count_);
751 EXPECT_EQ(1, observer.auth_needed_count_); 751 EXPECT_EQ(1, observer.auth_needed_count_);
752 EXPECT_EQ(1, observer.auth_cancelled_count_); 752 EXPECT_EQ(1, observer.auth_cancelled_count_);
753 EXPECT_TRUE(test_server()->Stop()); 753 EXPECT_TRUE(test_server()->Stop());
754 } 754 }
755 755
756 // Block crossdomain subresource login prompting as a phishing defense. 756 // Block crossdomain subresource login prompting as a phishing defense.
757 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, BlockCrossdomainPrompt) { 757 // Disabled per http://crbug.com/174179.
758 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
759 DISABLED_BlockCrossdomainPrompt) {
758 const char* kTestPage = "files/login/load_img_from_b.html"; 760 const char* kTestPage = "files/login/load_img_from_b.html";
759 761
760 host_resolver()->AddRule("www.a.com", "127.0.0.1"); 762 host_resolver()->AddRule("www.a.com", "127.0.0.1");
761 host_resolver()->AddRule("www.b.com", "127.0.0.1"); 763 host_resolver()->AddRule("www.b.com", "127.0.0.1");
762 ASSERT_TRUE(test_server()->Start()); 764 ASSERT_TRUE(test_server()->Start());
763 765
764 content::WebContents* contents = 766 content::WebContents* contents =
765 browser()->tab_strip_model()->GetActiveWebContents(); 767 browser()->tab_strip_model()->GetActiveWebContents();
766 NavigationController* controller = &contents->GetController(); 768 NavigationController* controller = &contents->GetController();
767 LoginPromptBrowserTestObserver observer; 769 LoginPromptBrowserTestObserver observer;
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 EXPECT_EQ(1, observer.auth_needed_count_); 1020 EXPECT_EQ(1, observer.auth_needed_count_);
1019 EXPECT_EQ(1, observer.auth_supplied_count_); 1021 EXPECT_EQ(1, observer.auth_supplied_count_);
1020 EXPECT_EQ(0, observer.auth_cancelled_count_); 1022 EXPECT_EQ(0, observer.auth_cancelled_count_);
1021 EXPECT_EQ(1, observer_incognito.auth_needed_count_); 1023 EXPECT_EQ(1, observer_incognito.auth_needed_count_);
1022 EXPECT_EQ(0, observer_incognito.auth_supplied_count_); 1024 EXPECT_EQ(0, observer_incognito.auth_supplied_count_);
1023 EXPECT_EQ(0, observer_incognito.auth_cancelled_count_); 1025 EXPECT_EQ(0, observer_incognito.auth_cancelled_count_);
1024 EXPECT_TRUE(test_server()->Stop()); 1026 EXPECT_TRUE(test_server()->Stop());
1025 } 1027 }
1026 1028
1027 } // namespace 1029 } // namespace
OLDNEW
« no previous file with comments | « no previous file | content/browser/loader/resource_dispatcher_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698