Refactor: remove bool* was_blocked from chrome::AddWebContents

This CL should not change behavior. We could probably remove the param
from WebContentsDelegate::AddWebContents but some delegates actually
set it, so the change would be more complicated and could change
behavior.

Bug: None
Change-Id: I2b25c7ae4fb86c2aad386697832bb5017ea7744f
Reviewed-on: https://chromium-review.googlesource.com/655126Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501385}

chrome/browser/background/background_contents_service.cc

@@ -867,6 +867,6 @@ void BackgroundContentsService::AddWebContents(
       Profile::FromBrowserContext(new_contents->GetBrowserContext()));
   if (browser) {
     chrome::AddWebContents(browser, NULL, new_contents, disposition,
-                           initial_rect, user_gesture, was_blocked);
+                           initial_rect, user_gesture);
   }
 }

chrome/browser/ui/app_list/custom_launcher_page_contents.cc

@@ -70,12 +70,8 @@ void CustomLauncherPageContents::AddNewContents(
     const gfx::Rect& initial_rect,
     bool user_gesture,
     bool* was_blocked) {
-  app_delegate_->AddNewContents(new_contents->GetBrowserContext(),
-                                new_contents,
-                                disposition,
-                                initial_rect,
-                                user_gesture,
-                                was_blocked);
+  app_delegate_->AddNewContents(new_contents->GetBrowserContext(), new_contents,
+                                disposition, initial_rect, user_gesture);
 }
 
 bool CustomLauncherPageContents::IsPopupOrPanel(

chrome/browser/ui/app_list/start_page_service.cc

@@ -169,7 +169,7 @@ class StartPageService::StartPageWebContentsDelegate
                       ? disposition
                       : WindowOpenDisposition::NEW_FOREGROUND_TAB;
     chrome::AddWebContents(displayer.browser(), nullptr, new_contents,
-                           disposition, initial_pos, user_gesture, was_blocked);
+                           disposition, initial_pos, user_gesture);
   }
 
   content::WebContents* OpenURLFromTab(

chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -233,8 +233,7 @@ void ChromeAppDelegate::AddNewContents(content::BrowserContext* context,
                                        content::WebContents* new_contents,
                                        WindowOpenDisposition disposition,
                                        const gfx::Rect& initial_rect,
-                                       bool user_gesture,
-                                       bool* was_blocked) {
+                                       bool user_gesture) {
   if (!disable_external_open_for_testing_) {
     // We don't really want to open a window for |new_contents|, but we need to
     // capture its intended navigation. Here we give ownership to the
@@ -250,13 +249,8 @@ void ChromeAppDelegate::AddNewContents(content::BrowserContext* context,
   disposition = disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB
                     ? disposition
                     : WindowOpenDisposition::NEW_FOREGROUND_TAB;
-  chrome::AddWebContents(displayer.browser(),
-                         NULL,
-                         new_contents,
-                         disposition,
-                         initial_rect,
-                         user_gesture,
-                         was_blocked);
+  chrome::AddWebContents(displayer.browser(), NULL, new_contents, disposition,
+                         initial_rect, user_gesture);
 }
 
 content::ColorChooser* ChromeAppDelegate::ShowColorChooser(

chrome/browser/ui/apps/chrome_app_delegate.h

@@ -51,8 +51,7 @@ class ChromeAppDelegate : public extensions::AppDelegate,
                       content::WebContents* new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_rect,
-                      bool user_gesture,
-                      bool* was_blocked) override;
+                      bool user_gesture) override;
   content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
                                           SkColor initial_color) override;
   void RunFileChooser(content::RenderFrameHost* render_frame_host,

chrome/browser/ui/browser.cc

@@ -1556,7 +1556,7 @@ void Browser::AddNewContents(WebContents* source,
   if (PopupBlockerTabHelper::ConsiderForPopupBlocking(disposition))
     PopupTracker::CreateForWebContents(new_contents);
   chrome::AddWebContents(this, source, new_contents, disposition, initial_rect,
-                         user_gesture, was_blocked);
+                         user_gesture);
 }
 
 void Browser::ActivateContents(WebContents* contents) {

chrome/browser/ui/browser_tabstrip.cc

@@ -51,8 +51,7 @@ void AddWebContents(Browser* browser,
                     content::WebContents* new_contents,
                     WindowOpenDisposition disposition,
                     const gfx::Rect& initial_rect,
-                    bool user_gesture,
-                    bool* was_blocked) {
+                    bool user_gesture) {
   // No code for this yet.
   DCHECK(disposition != WindowOpenDisposition::SAVE_TO_DISK);
   // Can't create a new contents for the current tab - invalid case.

chrome/browser/ui/browser_tabstrip.h

@@ -33,16 +33,13 @@ content::WebContents* AddSelectedTabWithURL(Browser* browser,
 // Creates a new tab with the already-created WebContents 'new_contents'.
 // The window for the added contents will be reparented correctly when this
 // method returns.  If |disposition| is NEW_POPUP, |initial_rect| should hold
-// the initial position and size. If |was_blocked| is non-NULL, then
-// |*was_blocked| will be set to true if the popup gets blocked, and left
-// unchanged otherwise.
+// the initial position and size.
 void AddWebContents(Browser* browser,
                     content::WebContents* source_contents,
                     content::WebContents* new_contents,
                     WindowOpenDisposition disposition,
                     const gfx::Rect& initial_rect,
-                    bool user_gesture,
-                    bool* was__blocked);
+                    bool user_gesture);
 
 // Closes the specified WebContents in the specified Browser. If
 // |add_to_history| is true, an entry in the historical tab database is created.

chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

@@ -97,10 +97,9 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, ShowInUninitializedTab) {
   std::unique_ptr<content::WebContents> web_contents(
       content::WebContents::Create(
           content::WebContents::CreateParams(browser()->profile())));
-  bool was_blocked = false;
   chrome::AddWebContents(browser(), NULL, web_contents.release(),
                          WindowOpenDisposition::NEW_BACKGROUND_TAB, gfx::Rect(),
-                         false, &was_blocked);
+                         false);
   content::WebContents* tab2 =
       browser()->tab_strip_model()->GetWebContentsAt(2);
   ASSERT_TRUE(tab2);

extensions/browser/app_window/app_delegate.h

@@ -52,8 +52,7 @@ class AppDelegate {
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_rect,
-                              bool user_gesture,
-                              bool* was_blocked) = 0;
+                              bool user_gesture) = 0;
 
   // Feature support.
   virtual content::ColorChooser* ShowColorChooser(

extensions/browser/app_window/app_window.cc

@@ -372,12 +372,8 @@ void AppWindow::AddNewContents(WebContents* source,
                                bool user_gesture,
                                bool* was_blocked) {
   DCHECK(new_contents->GetBrowserContext() == browser_context_);
-  app_delegate_->AddNewContents(browser_context_,
-                                new_contents,
-                                disposition,
-                                initial_rect,
-                                user_gesture,
-                                was_blocked);
+  app_delegate_->AddNewContents(browser_context_, new_contents, disposition,
+                                initial_rect, user_gesture);
 }
 
 content::KeyboardEventProcessingResult AppWindow::PreHandleKeyboardEvent(

extensions/shell/browser/shell_app_delegate.cc

@@ -45,8 +45,7 @@ void ShellAppDelegate::AddNewContents(content::BrowserContext* context,
                                       content::WebContents* new_contents,
                                       WindowOpenDisposition disposition,
                                       const gfx::Rect& initial_rect,
-                                      bool user_gesture,
-                                      bool* was_blocked) {
+                                      bool user_gesture) {
   NOTIMPLEMENTED();
 }
 

extensions/shell/browser/shell_app_delegate.h

@@ -31,8 +31,7 @@ class ShellAppDelegate : public AppDelegate {
                       content::WebContents* new_contents,
                       WindowOpenDisposition disposition,
                       const gfx::Rect& initial_rect,
-                      bool user_gesture,
-                      bool* was_blocked) override;
+                      bool user_gesture) override;
   content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
                                           SkColor initial_color) override;
   void RunFileChooser(content::RenderFrameHost* render_frame_host,