Remove old popup blocker.
This also removes the --disable-better-popup-blocking command line flag.
The BlockedContentTabHelper is now exclusively used by instant.
I moved the remaining browser tests to the new popup blocking
infrastructure.
BUG=none
[email protected]
Review URL: https://chromiumcodereview.appspot.com/22854020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218283 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index b1a2b08a..380ba1ce 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/process_map.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
@@ -660,24 +659,16 @@
browser(), GetTestBaseURL("app_process").Resolve("path3/container.html"));
WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
- BlockedContentTabHelper* blocked_content_tab_helper =
- BlockedContentTabHelper::FromWebContents(tab);
PopupBlockerTabHelper* popup_blocker_tab_helper =
PopupBlockerTabHelper::FromWebContents(tab);
- if (!blocked_content_tab_helper->GetBlockedContentsCount() &&
- (!popup_blocker_tab_helper ||
- !popup_blocker_tab_helper->GetBlockedPopupsCount())) {
+ if (!popup_blocker_tab_helper->GetBlockedPopupsCount()) {
content::WindowedNotificationObserver observer(
chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
content::NotificationService::AllSources());
observer.Wait();
}
- EXPECT_EQ(1u,
- blocked_content_tab_helper->GetBlockedContentsCount() +
- (popup_blocker_tab_helper
- ? popup_blocker_tab_helper->GetBlockedPopupsCount()
- : 0));
+ EXPECT_EQ(1u, popup_blocker_tab_helper->GetBlockedPopupsCount());
}
// Tests that if an extension launches an app via chrome.tabs.create with an URL
