Move Android to use new Popup Blocker API.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index f239cc76729a337c81cc9e4b0bb55be9e51a6c99..6b84b5570e25250b1e492c29db2aca2ba1c6cac8 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -81,6 +81,7 @@
 #include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/sync/sync_promo_ui.h"
 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h"
@@ -169,10 +170,6 @@
 #include "chrome/browser/crash_handler_host_linux.h"
 #endif
 
-#if !defined(OS_ANDROID)
-#include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
-#endif
-
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 #endif
@@ -525,7 +522,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
   g_io_thread_application_locale.Get() = locale;
 }
 
-#if !defined(OS_ANDROID)
 struct BlockedPopupParams {
   BlockedPopupParams(const GURL& target_url,
                      const content::Referrer& referrer,
@@ -572,7 +568,6 @@ void HandleBlockedPopupOnUIThread(const BlockedPopupParams& params) {
                                 params.user_gesture,
                                 params.opener_suppressed);
 }
-#endif
 
 }  // namespace
 
@@ -1996,7 +1991,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
     return false;
   }
 
-#if !defined(OS_ANDROID)
   if (is_guest)
     return true;
 
@@ -2026,7 +2020,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
                                                           opener_id)));
     return false;
   }
-#endif
 
   return true;
 }