Merge 222640 "Use the top-level URL for popup blocking."

content/public/browser/content_browser_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/browser/content_browser_client.h"
 
 #include "base/files/file_path.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
@@ skipping 190 matching lines @@
 WebKit::WebNotificationPresenter::Permission
     ContentBrowserClient::CheckDesktopNotificationPermission(
         const GURL& source_origin,
         ResourceContext* context,
         int render_process_id) {
   return WebKit::WebNotificationPresenter::PermissionAllowed;
 }
 
 bool ContentBrowserClient::CanCreateWindow(
     const GURL& opener_url,
+    const GURL& opener_top_level_frame_url,
     const GURL& source_origin,
     WindowContainerType container_type,
     const GURL& target_url,
     const content::Referrer& referrer,
     WindowOpenDisposition disposition,
     const WebKit::WebWindowFeatures& features,
     bool user_gesture,
     bool opener_suppressed,
     content::ResourceContext* context,
     int render_process_id,
@@ skipping 68 matching lines @@
 #endif
 
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
   return NULL;
 }
 #endif
 
 }  // namespace content