Remove the retargeting notification

chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.h

 // Copyright 2016 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_SAFE_BROWSING_SAFE_BROWSING_NAVIGATION_OBSERVER_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_NAVIGATION_OBSERVER_MANAGER_H_
 
 #include <deque>
 #include "base/feature_list.h"
 #include "base/supports_user_data.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
 #include "url/gurl.h"
 
 class Profile;
 
 namespace safe_browsing {
 
 class SafeBrowsingNavigationObserver;
 struct NavigationEvent;
@@ skipping 63 matching lines @@
   }
 
  private:
   std::deque<std::unique_ptr<NavigationEvent>> navigation_events_;
   const std::size_t size_limit_;
 };
 
 // Manager class for SafeBrowsingNavigationObserver, which is in charge of
 // cleaning up stale navigation events, and identifying landing page/landing
 // referrer for a specific download.
-// TODO(jialiul): For now, SafeBrowsingNavigationObserverManager also listens to
-// NOTIFICATION_RETARGETING as a way to detect cross frame/tab navigation.
-// Remove base class content::NotificationObserver when
-// WebContentsObserver::DidOpenRequestedURL() covers all retargeting cases.
 class SafeBrowsingNavigationObserverManager
-    : public content::NotificationObserver,
-      public base::RefCountedThreadSafe<SafeBrowsingNavigationObserverManager> {
+    : public base::RefCountedThreadSafe<SafeBrowsingNavigationObserverManager> {
  public:
   static const base::Feature kDownloadAttribution;
 
   // For UMA histogram counting. Do NOT change order.
   enum AttributionResult {
     SUCCESS = 1,                   // Identified referrer chain is not empty.
     SUCCESS_LANDING_PAGE = 2,      // Successfully identified landing page.
     SUCCESS_LANDING_REFERRER = 3,  // Successfully identified landing referrer.
     INVALID_URL = 4,
     NAVIGATION_EVENT_NOT_FOUND = 5,
@@ skipping 68 matching lines @@
   // these identified NavigationEvents into ReferrerChainEntrys and append them
   // to |out_referrer_chain|.
   AttributionResult IdentifyReferrerChainForDownloadHostingPage(
       const GURL& initiating_frame_url,
       const GURL& initiating_main_frame_url,
       int tab_id,
       bool has_user_gesture,
       int user_gesture_count_limit,
       ReferrerChain* out_referrer_chain);
 
+  // Record the creation of a new WebContents by |source_web_contents|. This is
+  // used to detect cross-frame and cross-tab navigations.
+  void RecordNewWebContents(content::WebContents* source_web_contents,
+                            int source_render_process_id,
+                            int source_render_frame_id,
+                            GURL target_url,
+                            content::WebContents* target_web_contents,
+                            bool not_yet_in_tabstrip);
+
  private:
   friend class base::RefCountedThreadSafe<
       SafeBrowsingNavigationObserverManager>;
   friend class TestNavigationObserverManager;
   friend class SBNavigationObserverBrowserTest;
   friend class SBNavigationObserverTest;
 
   struct GurlHash {
     std::size_t operator()(const GURL& url) const {
       return std::hash<std::string>()(url.spec());
     }
   };
 
   typedef std::unordered_map<content::WebContents*, base::Time> UserGestureMap;
   typedef std::unordered_map<std::string, std::vector<ResolvedIPAddress>>
       HostToIpMap;
 
-  ~SafeBrowsingNavigationObserverManager() override;
-
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
-  void RecordRetargeting(const content::NotificationDetails& details);
+  virtual ~SafeBrowsingNavigationObserverManager();
 
   NavigationEventList* navigation_event_list() {
     return &navigation_event_list_;
   }
 
   HostToIpMap* host_to_ip_map() { return &host_to_ip_map_; }
 
   // Remove stale entries from navigation_event_list_ if they are older than
   // kNavigationFootprintTTLInSecond (2 minutes).
   void CleanUpNavigationEvents();
@@ skipping 37 matching lines @@
   // shortly after a user gesture indicate this navigation is user initiated.
   UserGestureMap user_gesture_map_;
 
   // Host to timestamped IP addresses map that covers all the main frame and
   // subframe URLs' hosts. Since it is possible for a host to resolve to more
   // than one IP in even a short period of time, we map a single host to a
   // vector of ResolvedIPAddresss. This map is used to fill in ip_address field
   // in URLChainEntry in ClientDownloadRequest.
   HostToIpMap host_to_ip_map_;
 
-  content::NotificationRegistrar registrar_;
-
   base::OneShotTimer cleanup_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingNavigationObserverManager);
 };
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_NAVIGATION_OBSERVER_MANAGER_H_