In previous implementation, if the server does the more than one server redirects, we only record t…

chrome/browser/safe_browsing/safe_browsing_navigation_observer.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_navigation_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 13 matching lines @@
     "web_contents_safe_browsing_navigation_observer";
 }  // namespace
 
 namespace safe_browsing {
 
 // SafeBrowsingNavigationObserver::NavigationEvent-----------------------------
 NavigationEvent::NavigationEvent()
     : source_url(),
       source_main_frame_url(),
       original_request_url(),
-      destination_url(),
       source_tab_id(-1),
       target_tab_id(-1),
       frame_id(-1),
       last_updated(base::Time::Now()),
       is_user_initiated(false),
-      has_committed(false),
-      has_server_redirect(false) {}
+      has_committed(false) {}
 
 NavigationEvent::NavigationEvent(NavigationEvent&& nav_event)
     : source_url(std::move(nav_event.source_url)),
       source_main_frame_url(std::move(nav_event.source_main_frame_url)),
       original_request_url(std::move(nav_event.original_request_url)),
-      destination_url(std::move(nav_event.destination_url)),
+      server_redirect_urls(std::move(nav_event.server_redirect_urls)),
       source_tab_id(std::move(nav_event.source_tab_id)),
       target_tab_id(std::move(nav_event.target_tab_id)),
       frame_id(nav_event.frame_id),
       last_updated(nav_event.last_updated),
       is_user_initiated(nav_event.is_user_initiated),
-      has_committed(nav_event.has_committed),
-      has_server_redirect(nav_event.has_server_redirect) {}
+      has_committed(nav_event.has_committed) {}
 
 NavigationEvent& NavigationEvent::operator=(NavigationEvent&& nav_event) {
   source_url = std::move(nav_event.source_url);
   source_main_frame_url = std::move(nav_event.source_main_frame_url);
   original_request_url = std::move(nav_event.original_request_url);
-  destination_url = std::move(nav_event.destination_url);
   source_tab_id = nav_event.source_tab_id;
   target_tab_id = nav_event.target_tab_id;
   frame_id = nav_event.frame_id;
   last_updated = nav_event.last_updated;
   is_user_initiated = nav_event.is_user_initiated;
   has_committed = nav_event.has_committed;
-  has_server_redirect = nav_event.has_server_redirect;
+  server_redirect_urls = std::move(nav_event.server_redirect_urls);
   return *this;
 }
 
 NavigationEvent::~NavigationEvent() {}
 
 // SafeBrowsingNavigationObserver --------------------------------------------
 
 // static
 void SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
     content::WebContents* web_contents) {
@@ skipping 75 matching lines @@
   // don't fill the source_url to prevent attributing navigation to the last
   // committed navigation.
   if (navigation_handle->IsRendererInitiated() && current_frame_host &&
       current_frame_host->GetLastCommittedURL().is_valid()) {
     nav_event.source_url = SafeBrowsingNavigationObserverManager::ClearEmptyRef(
         current_frame_host->GetLastCommittedURL());
   }
   nav_event.original_request_url =
       SafeBrowsingNavigationObserverManager::ClearEmptyRef(
           navigation_handle->GetURL());
-  nav_event.destination_url = nav_event.original_request_url;
 
   nav_event.source_tab_id =
       SessionTabHelper::IdForTab(navigation_handle->GetWebContents());
 
   if (navigation_handle->IsInMainFrame()) {
     nav_event.source_main_frame_url = nav_event.source_url;
   } else {
     nav_event.source_main_frame_url =
         SafeBrowsingNavigationObserverManager::ClearEmptyRef(
             navigation_handle->GetWebContents()->GetLastCommittedURL());
   }
   navigation_handle_map_[navigation_handle] = std::move(nav_event);
 }
 
 void SafeBrowsingNavigationObserver::DidRedirectNavigation(
     content::NavigationHandle* navigation_handle) {
   // We should have already seen this navigation_handle in DidStartNavigation.
   if (navigation_handle_map_.find(navigation_handle) ==
       navigation_handle_map_.end()) {
     NOTREACHED();
     return;
   }
 
   NavigationEvent* nav_event = &navigation_handle_map_[navigation_handle];
-  nav_event->has_server_redirect = true;
-  nav_event->destination_url =
+  nav_event->server_redirect_urls.push_back(
       SafeBrowsingNavigationObserverManager::ClearEmptyRef(
-          navigation_handle->GetURL());
+          navigation_handle->GetURL()));
   nav_event->last_updated = base::Time::Now();
 }
 
 void SafeBrowsingNavigationObserver::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   if (navigation_handle_map_.find(navigation_handle) ==
       navigation_handle_map_.end()) {
     NOTREACHED();
     return;
   }
 
   // If it is an error page, we ignore this navigation.
   if (navigation_handle->IsErrorPage()) {
     navigation_handle_map_.erase(navigation_handle);
     return;
   }
   NavigationEvent* nav_event = &navigation_handle_map_[navigation_handle];
 
   nav_event->has_committed = navigation_handle->HasCommitted();
   nav_event->target_tab_id =
       SessionTabHelper::IdForTab(navigation_handle->GetWebContents());
   nav_event->last_updated = base::Time::Now();
 
-  manager_->RecordNavigationEvent(nav_event->destination_url, nav_event);
+  manager_->RecordNavigationEvent(nav_event->GetDestinationUrl(), nav_event);
   navigation_handle_map_.erase(navigation_handle);
 }
 
 void SafeBrowsingNavigationObserver::DidGetResourceResponseStart(
     const content::ResourceRequestDetails& details) {
   // We only care about main frame and sub frame.
   if (details.resource_type != content::RESOURCE_TYPE_MAIN_FRAME &&
       details.resource_type != content::RESOURCE_TYPE_SUB_FRAME) {
     return;
   }
@@ skipping 13 matching lines @@
                                             last_user_gesture_timestamp_);
 }
 
 void SafeBrowsingNavigationObserver::WebContentsDestroyed() {
   manager_->OnWebContentDestroyed(web_contents());
   web_contents()->RemoveUserData(kWebContentsUserDataKey);
   // web_contents is null after this function.
 }
 
 }  // namespace safe_browsing