Improve memory usage of safe browsing navigation oberver manager.

(And add a TODO for PPAPI download attribution)

BUG=676691

Review-Url: https://codereview.chromium.org/2606843002
Cr-Commit-Position: refs/heads/master@{#440860}

chrome/browser/safe_browsing/download_protection_service.cc

@@ -1358,10 +1358,9 @@ class DownloadProtectionService::PPAPIDownloadRequest
       *(request.add_alternate_extensions()) =
           base::FilePath(default_file_path_.FinalExtension()).AsUTF8Unsafe();
     }
-    service_->AddReferrerChainToClientDownloadRequest(
-      requestor_url_,
-      nullptr,
-      &request);
+
+    // TODO(676691): We should add reliable download referrer chain for PPAPI
+    // downloads too.
 
     if (!request.SerializeToString(&client_download_request_data_)) {
       // More of an internal error than anything else. Note that the UNKNOWN
@@ -1821,7 +1820,7 @@ void DownloadProtectionService::AddReferrerChainToClientDownloadRequest(
       "SafeBrowsing.ReferrerAttributionResult.DownloadAttribution", result,
       SafeBrowsingNavigationObserverManager::ATTRIBUTION_FAILURE_TYPE_MAX);
   for (auto entry : attribution_chain)
-    *out_request->add_referrer_chain() = std::move(entry);
+    out_request->add_referrer_chain()->Swap(&entry);
 }
 
 }  // namespace safe_browsing

chrome/browser/safe_browsing/safe_browsing_navigation_observer_manager.cc

@@ -394,7 +394,7 @@ void SafeBrowsingNavigationObserverManager::AddToReferrerChain(
                                           nav_event->target_tab_id);
   referrer_chain_entry.set_navigation_time_msec(
       nav_event->last_updated.ToJavaTime());
-  referrer_chain->push_back(referrer_chain_entry);
+  referrer_chain->push_back(std::move(referrer_chain_entry));
 }
 
 }  // namespace safe_browsing