[ios] Convert BlockedPopupHandler into a tab helper class.

ios/chrome/browser/web/blocked_popup_handler.h

Index: ios/chrome/browser/web/blocked_popup_handler.h
diff --git a/ios/chrome/browser/web/blocked_popup_handler.h b/ios/chrome/browser/web/blocked_popup_handler.h
index 0f03aa5ec98ef52e01612ec96d90b3b64122f19c..1de501484592c49468e376938a19988fb90cdd76 100644
--- a/ios/chrome/browser/web/blocked_popup_handler.h
+++ b/ios/chrome/browser/web/blocked_popup_handler.h
@@ -11,23 +11,21 @@
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "components/infobars/core/infobar_manager.h"
+#include "ios/web/public/web_state/web_state_user_data.h"

[Eugene But (OOO till 7-30), 2017/01/17 18:04:53]

nit: s/include/import

[rohitrao (ping after 24h), 2017/01/17 21:49:29]

I thought there was a presubmit that would have caught this.  Is that not
running yet?

[Eugene But (OOO till 7-30), 2017/01/17 22:10:21]

Still on review :(
https://codereview.chromium.org/2598173002/

 #include "ios/web/web_state/blocked_popup_info.h"
 #include "url/gurl.h"
 
-namespace ios {
-class ChromeBrowserState;
-}
-
-@protocol BlockedPopupHandlerDelegate;
-
 // Handles blocked popups. Will display an infobar informing the user and
 // allowing the user to add an exception and navigate to the site.
-class BlockedPopupHandler : public infobars::InfoBarManager::Observer {
+class BlockedPopupHandler : public infobars::InfoBarManager::Observer,
+                            public web::WebStateUserData<BlockedPopupHandler> {
  public:
-  explicit BlockedPopupHandler(ios::ChromeBrowserState* browser_state);
+  static void CreateForWebState(web::WebState* web_state);

[Eugene But (OOO till 7-30), 2017/01/17 18:04:53]

Do you actually need this method? WebStateUserData has it already:
https://cs.chromium.org/chromium/src/ios/web/public/web_state/web_state_user_...

[rohitrao (ping after 24h), 2017/01/17 21:49:29]

Done.

   ~BlockedPopupHandler() override;
 
-  void SetDelegate(id<BlockedPopupHandlerDelegate> delegate);
+  // Initalizes this BlockedPopupHandler.  Must be called after all tab helpers

[Eugene But (OOO till 7-30), 2017/01/17 18:04:53]

Would Sylvain's proposal work for you? Alternatively CreateForWebState could
take InfoBarManager object to enforce the dependency in the code.

[rohitrao (ping after 24h), 2017/01/17 21:49:29]

Sylvain's suggestion allows me to sidestep this issue for now.

+  // have been created.
+  void Initialize();
 
   // Show the popup blocker infobar for the given popup.
   void HandlePopup(const web::BlockedPopupInfo& blocked_popup_info);
@@ -38,14 +36,14 @@ class BlockedPopupHandler : public infobars::InfoBarManager::Observer {
       infobars::InfoBarManager* infobar_manager) override;
 
  private:
+  explicit BlockedPopupHandler(web::WebState* web_state);
+
   // Show the infobar for the current popups. Will also handle replacing an
   // existing infobar with the updated count.
   void ShowInfoBar();
 
-  // The user browser state.
-  ios::ChromeBrowserState* browser_state_;
-  // The delegate that will display the infobar.
-  id<BlockedPopupHandlerDelegate> delegate_;
+  // The WebState that this object is attached to.
+  web::WebState* web_state_;
   // The currently displayed infobar.
   infobars::InfoBar* infobar_;
   // The popups to open.
@@ -57,12 +55,4 @@ class BlockedPopupHandler : public infobars::InfoBarManager::Observer {
   DISALLOW_COPY_AND_ASSIGN(BlockedPopupHandler);
 };
 
-// Methods implemented by the delegate of the BlockedPopupHandler.
-@protocol BlockedPopupHandlerDelegate
-
-// Returns the infobars::InfoBarManager.
-- (infobars::InfoBarManager*)infoBarManager;
-
-@end
-
 #endif  // IOS_CHROME_BROWSER_WEB_BLOCKED_POPUP_HANDLER_H_