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 97d276191cd605d375c7edfd10c1c217e583f084..8f56ffacea128e296961c72d592a39015b9c94cc 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"
@@ -170,10 +171,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
@@ -526,7 +523,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,
@@ -573,7 +569,6 @@ void HandleBlockedPopupOnUIThread(const BlockedPopupParams& params) {
                                 params.user_gesture,
                                 params.opener_suppressed);
 }
-#endif
 
 }  // namespace
 
@@ -2002,7 +1997,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
     return false;
   }
 
-#if !defined(OS_ANDROID)
   if (is_guest)
     return true;
 
@@ -2032,7 +2026,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
                                                           opener_id)));
     return false;
   }
-#endif
 
   return true;
 }