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.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_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_NAVIGATION_OBSERVER_H_
 
 #include "base/supports_user_data.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
@@ skipping 15 matching lines @@
   ~NavigationEvent();
 
   GURL source_url;  // URL that caused this navigation to occur.
                     // TODO(jialiul): source_url may be incorrect when
                     // navigation involves frames targeting each other.
                     // http://crbug.com/651895.
   GURL source_main_frame_url;  // Main frame url of the source_url. Could be the
                                // same as source_url, if source_url was loaded
                                // in main frame.
   GURL original_request_url;   // The original request URL of this navigation.
-  GURL destination_url;        // The actual destination url of this navigation
-                               // event. If this navigation has server side
-                               // redirect(s), actual_target_url will be
-                               // different from initial_request_url.
+  std::vector<GURL> server_redirect_urls;  // Server redirect url chain.
+                                           // Empty if there is no server
+                                           // redirect. If set, last url in this
+                                           // vector is the destination url.
   int source_tab_id;  // Which tab contains the frame with source_url. Tab ID is
                       // returned by SessionTabHelper::IdForTab. This ID is
                       // immutable for a given tab and unique across Chrome
                       // within the current session.
   int target_tab_id;  // Which tab this request url is targeting to.
   int frame_id;  // Frame tree node ID of the frame where this navigation takes
                  // place.
   base::Time last_updated;  // When this NavigationEvent was last updated.
   bool is_user_initiated;  // browser_initiated || has_user_gesture.
   bool has_committed;
-  bool has_server_redirect;
+
+  const GURL& GetDestinationUrl() const {
+    if (!server_redirect_urls.empty())
+      return server_redirect_urls.back();
+    else
+      return original_request_url;
+  }
 };
 
 // Structure to keep track of resolved IP address of a host.
 struct ResolvedIPAddress {
   ResolvedIPAddress() : timestamp(base::Time::Now()), ip() {}
   ResolvedIPAddress(base::Time timestamp, const std::string& ip)
       : timestamp(timestamp), ip(ip) {}
   base::Time timestamp;  // Timestamp of when we get the resolved IP.
   std::string ip;        // Resolved IP address
 };
@@ skipping 45 matching lines @@
   bool has_user_gesture_;
 
   base::Time last_user_gesture_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingNavigationObserver);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_NAVIGATION_OBSERVER_H_