Remove AppBannerManager::event_request_id().

chrome/browser/banners/app_banner_manager.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_
 
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 50 matching lines @@
 
   // Requests an app banner. If |is_debug_mode| is true, any failure in the
   // pipeline will be reported to the devtools console.
   virtual void RequestAppBanner(const GURL& validated_url, bool is_debug_mode);
 
   // Informs the page that it has been installed via an app banner.
   // This is redundant for the beforeinstallprompt event's promise being
   // resolved, but is required by the install event spec.
   void OnInstall();
 
-  // Sends a message to the renderer that the user accepted the banner. Does
-  // nothing if |request_id| does not match the current request.
-  void SendBannerAccepted(int request_id);
+  // Sends a message to the renderer that the user accepted the banner.
+  void SendBannerAccepted();
 
-  // Sends a message to the renderer that the user dismissed the banner. Does
-  // nothing if |request_id| does not match the current request.
-  void SendBannerDismissed(int request_id);
+  // Sends a message to the renderer that the user dismissed the banner.
+  void SendBannerDismissed();
 
   // Returns a WeakPtr to this object. Exposed so subclasses/infobars may
   // may bind callbacks without needing their own WeakPtrFactory.
   base::WeakPtr<AppBannerManager> GetWeakPtr();
 
   // Overridden and passed through base::Bind on desktop platforms. Called when
   // the bookmark app install initiated by a banner has completed. Not used on
   // Android.
   virtual void DidFinishCreatingBookmarkApp(
       const extensions::Extension* extension,
@@ skipping 122 matching lines @@
   void WebContentsDestroyed() override;
 
   // SiteEngagementObserver overrides.
   void OnEngagementIncreased(content::WebContents* web_contents,
                              const GURL& url,
                              double score) override;
 
   // Subclass accessors for private fields which should not be changed outside
   // this class.
   InstallableManager* manager() const { return manager_; }
-  int event_request_id() const { return event_request_id_; }
   bool is_active() const { return state_ == State::ACTIVE; }
   bool is_active_or_pending() const {
     switch (state_) {
       case State::ACTIVE:
       case State::PENDING_MANIFEST:
       case State::PENDING_INSTALLABLE_CHECK:
       case State::PENDING_ENGAGEMENT:
       case State::PENDING_EVENT:
         return true;
       case State::INACTIVE:
@@ skipping 28 matching lines @@
   // The referrer string (if any) specified in the app URL. Used only for native
   // app banners.
   std::string referrer_;
 
   // The current banner pipeline state for this page load.
   State state_;
 
  private:
   friend class AppBannerManagerTest;
 
+  // Voids all outstanding weak pointers and service pointers.
+  void ResetBindings();
+
   // Record that the banner could be shown at this point, if the triggering
   // heuristic allowed.
   void RecordCouldShowBanner();
 
   // Creates a banner for the app. Overridden by subclasses as the infobar is
   // platform-specific.
   virtual void ShowBanner() = 0;
 
   // Called after the manager sends a message to the renderer regarding its
   // intention to show a prompt. The renderer will send a message back with the
   // opportunity to cancel.
   void OnBannerPromptReply(blink::mojom::AppBannerPromptReply reply,
                            const std::string& referrer);
 
   // blink::mojom::AppBannerService overrides.
   // Called when Blink has prevented a banner from being shown, and is now
   // requesting that it be shown later.
   void DisplayAppBanner(bool user_gesture) override;
 
   // Fetches the data required to display a banner for the current page.
   InstallableManager* manager_;
 
-  // A monotonically increasing id to verify the response to the
-  // beforeinstallprompt event from the renderer.
-  int event_request_id_;
-
   // We do not want to trigger a banner when the manager is attached to
   // a WebContents that is playing video. Banners triggering on a site in the
   // background will appear when the tab is reactivated.
   std::vector<MediaPlayerId> active_media_players_;
 
   // Mojo bindings and interface pointers.
   mojo::Binding<blink::mojom::AppBannerService> binding_;
   blink::mojom::AppBannerEventPtr event_;
   blink::mojom::AppBannerControllerPtr controller_;
 
@@ skipping 15 matching lines @@
   // scoped to the WebContents which they are observing. This allows us to use
   // weak pointers for callbacks.
   base::WeakPtrFactory<AppBannerManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerManager);
 };
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_