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

Side by Side Diff: chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

Issue 2206963002: Plumb the frame name through the popup blocker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 EXPECT_TRUE(249 <= window_size.height() && window_size.height() <= 251); 414 EXPECT_TRUE(249 <= window_size.height() && window_size.height() <= 251);
415 } 415 }
416 416
417 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CorrectReferrer) { 417 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CorrectReferrer) {
418 RunCheckTest(browser(), 418 RunCheckTest(browser(),
419 "/popup_blocker/popup-referrer.html", 419 "/popup_blocker/popup-referrer.html",
420 ExpectTab, 420 ExpectTab,
421 CheckTitle); 421 CheckTitle);
422 } 422 }
423 423
424 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, CorrectFrameName) {
425 RunCheckTest(browser(),
426 "/popup_blocker/popup-framename.html",
427 ExpectTab,
428 CheckTitle);
429 }
430
424 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, WindowFeaturesBarProps) { 431 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, WindowFeaturesBarProps) {
425 RunCheckTest(browser(), 432 RunCheckTest(browser(),
426 "/popup_blocker/popup-windowfeatures.html", 433 "/popup_blocker/popup-windowfeatures.html",
427 ExpectPopup, 434 ExpectPopup,
428 CheckTitle); 435 CheckTitle);
429 } 436 }
430 437
431 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, SessionStorage) { 438 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, SessionStorage) {
432 RunCheckTest(browser(), 439 RunCheckTest(browser(),
433 "/popup_blocker/popup-sessionstorage.html", 440 "/popup_blocker/popup-sessionstorage.html",
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 608
602 wait_for_new_tab.Wait(); 609 wait_for_new_tab.Wait();
603 610
604 ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile())); 611 ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
605 ASSERT_EQ(2, browser()->tab_strip_model()->count()); 612 ASSERT_EQ(2, browser()->tab_strip_model()->count());
606 // Check that we create the background tab. 613 // Check that we create the background tab.
607 ASSERT_EQ(0, browser()->tab_strip_model()->active_index()); 614 ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
608 } 615 }
609 616
610 } // namespace 617 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/ui/blocked_content/blocked_window_params.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698