Add management related code to SafeBrowsingNavigationObserverManager

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/safe_browsing/safe_browsing_navigation_observer_manager.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
@@ skipping 119 matching lines @@
   // set it as the source url of this navigation. Otherwise, this is the
   // first url going to commit in this frame. We set navigation_handle's URL as
   // the source url.
   // TODO(jialiul): source_url, source_tab_id, and source_main_frame_url may be
   // incorrect when another frame is targeting this frame. Need to refine this
   // logic after the true initiator details are added to NavigationHandle
   // (https://crbug.com/651895).
   content::RenderFrameHost* current_frame_host =
       navigation_handle->GetWebContents()->FindFrameByFrameTreeNodeId(
           nav_event.frame_id);
-  if (current_frame_host &&
+  // For browser initiated navigation (e.g. from address bar or bookmark), we

[Charlie Reis, 2016/12/09 22:00:24]

Sounds right.

[Jialiu Lin, 2016/12/12 23:43:37]

thanks for confirming.

+  // 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 =
@@ skipping 52 matching lines @@
 
 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;
   }
   if (!details.url.is_valid() || details.socket_address.IsEmpty())
     return;
-
-  manager_->RecordHostToIpMapping(details.url.host(),
-                                  details.socket_address.host());
+  if (!details.url.host().empty())

[Charlie Reis, 2016/12/09 22:00:24]

Style nit: Needs braces, since body is more than one line.

[Jialiu Lin, 2016/12/12 23:43:37]

Thanks for catching this.

+    manager_->RecordHostToIpMapping(details.url.host(),
+                                    details.socket_address.host());
 }
 
 void SafeBrowsingNavigationObserver::DidGetUserInteraction(
     const blink::WebInputEvent::Type type) {
   last_user_gesture_timestamp_ = base::Time::Now();
   has_user_gesture_ = true;
-  // TODO (jialiul): Refine user gesture logic when DidOpenRequestedURL
-  // covers all retargetting cases.
   manager_->RecordUserGestureForWebContents(web_contents(),
                                             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