Include high-fidelity metadata about a download in incident reports.

chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc

 // Copyright 2014 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/incident_reporting/last_download_finder.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 135 matching lines @@
         profile_name,
         prefs.Pass(),
         base::UTF8ToUTF16(profile_name),  // user_name
         0,                                // avatar_id
         std::string(),                    // supervised_user_id
         factories);
 
     return profile;
   }
 
+  safe_browsing::LastDownloadFinder::DownloadDetailsGetter

[Alexei Svitkine (slow), 2014/10/27 17:09:07]

Make the code in this file be in safe_browsing namespace, that way you won't
need to prefix references to safe_browsing:: code and possibly make wrapping
better throughout the file.

[grt (UTC plus 2), 2014/10/30 15:11:40]

Done.

+  GetDownloadDetailsGetter() {
+    return base::Bind(&LastDownloadFinderTest::GetDownloadDetails,
+                      base::Unretained(this));
+  }
+
   void AddDownload(Profile* profile, const history::DownloadRow& download) {
     base::RunLoop run_loop;
 
     HistoryService* history_service =
         HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
     history_service->CreateDownload(
         download,
         base::Bind(&LastDownloadFinderTest::ContinueOnDownloadCreated,
                    base::Unretained(this),
                    run_loop.QuitClosure()));
@@ skipping 22 matching lines @@
   // download or an empty pointer if none was found.
   scoped_ptr<safe_browsing::ClientIncidentReport_DownloadDetails>
   RunLastDownloadFinder() {
     base::RunLoop run_loop;
 
     scoped_ptr<safe_browsing::ClientIncidentReport_DownloadDetails>
         last_download;
 
     scoped_ptr<safe_browsing::LastDownloadFinder> finder(
         safe_browsing::LastDownloadFinder::Create(
+            GetDownloadDetailsGetter(),
             base::Bind(&LastDownloadFinderTest::OnLastDownload,
                        base::Unretained(this),
                        &last_download,
                        run_loop.QuitClosure())));
 
     if (finder)
       run_loop.Run();
 
     return last_download.Pass();
   }
@@ skipping 40 matching lines @@
   // created and runs |closure|.
   void ContinueOnDownloadCreated(const base::Closure& closure, bool created) {
     ASSERT_TRUE(created);
     closure.Run();
   }
 
   // A HistoryService::DownloadCreateCallback that asserts that the download was
   // created.
   void OnDownloadCreated(bool created) { ASSERT_TRUE(created); }
 
+  void GetDownloadDetails(
+      content::BrowserContext* context,
+      const safe_browsing::DownloadMetadataManager::GetDownloadDetailsCallback&
+          callback) {
+    callback.Run(
+        scoped_ptr<safe_browsing::ClientIncidentReport_DownloadDetails>());
+  }
+
   int profile_number_;
 };
 
 // Tests that nothing happens if there are no profiles at all.
 TEST_F(LastDownloadFinderTest, NoProfiles) {
   ExpectNoDownloadFound(RunLastDownloadFinder());
 }
 
 // Tests that nothing happens other than the callback being invoked if there are
 // no profiles participating in safe browsing.
@@ skipping 21 matching lines @@
 // Tests that there is no crash if the finder is deleted before results arrive.
 TEST_F(LastDownloadFinderTest, DeleteBeforeResults) {
   // Create a profile with a history service that is opted-in.
   TestingProfile* profile = CreateProfile(SAFE_BROWSING_OPT_IN);
 
   // Add a download.
   AddDownload(profile, CreateTestDownloadRow());
 
   // Start a finder and kill it before the search completes.
   safe_browsing::LastDownloadFinder::Create(
+      GetDownloadDetailsGetter(),
       base::Bind(&LastDownloadFinderTest::NeverCalled, base::Unretained(this)))
       .reset();
 
   // Flush tasks on the history backend thread.
   FlushHistoryBackend(profile);
 }
 
 // Tests that a download in profile added after the search is begun is found.
 TEST_F(LastDownloadFinderTest, AddProfileAfterStarting) {
   // Create a profile with a history service that is opted-in.
   CreateProfile(SAFE_BROWSING_OPT_IN);
 
   scoped_ptr<safe_browsing::ClientIncidentReport_DownloadDetails> last_download;
   base::RunLoop run_loop;
 
   // Post a task that will create a second profile once the main loop is run.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&LastDownloadFinderTest::CreateProfileWithDownload,
                  base::Unretained(this)));
 
   // Create a finder that we expect will find a download in the second profile.
   scoped_ptr<safe_browsing::LastDownloadFinder> finder(
       safe_browsing::LastDownloadFinder::Create(
+          GetDownloadDetailsGetter(),
           base::Bind(&LastDownloadFinderTest::OnLastDownload,
                      base::Unretained(this),
                      &last_download,
                      run_loop.QuitClosure())));
 
   run_loop.Run();
 
   ExpectFoundTestDownload(last_download.Pass());
 }