Refrain from sending hit report when user is in incognito mode

chrome/browser/safe_browsing/ui_manager.h

 // Copyright (c) 2012 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.
 //
 // The Safe Browsing service is responsible for downloading anti-phishing and
 // anti-malware tables and checking urls against them.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_
 
@@ skipping 51 matching lines @@
   // multiple times during the life of the UIManager. Should be called
   // on IO thread. If shutdown is true, the manager is disabled permanently.
   void StopOnIOThread(bool shutdown) override;
 
   // Called on the IO thread by the ThreatDetails with the serialized
   // protocol buffer, so the service can send it over.
   void SendSerializedThreatDetails(const std::string& serialized) override;
 
   // Report hits to the unsafe contents (malware, phishing, unsafe download URL)
   // to the server. Can only be called on UI thread.  If |post_data| is
   // non-empty, the request will be sent as a POST instead of a GET.

[vakh (use Gerrit instead), 2017/05/19 22:41:13]

I don't see the |post_data| argument to the function. I think this comment is in
dire need of an update. It also needs to mention that the report is not sent
from Incognito mode.

[mortonm, 2017/05/22 17:03:59]

Done.

-  // Will report only for UMA || is_extended_reporting.
-  void MaybeReportSafeBrowsingHit(
-      const safe_browsing::HitReport& hit_report) override;
+  void MaybeReportSafeBrowsingHit(const safe_browsing::HitReport& hit_report,
+                                  content::WebContents* web_contents) override;
 
   // Report permission action to SafeBrowsing servers. Can only be called on UI
   // thread.
   void ReportPermissionAction(const PermissionReportInfo& report_info);
 
   // Creates the whitelist URL set for tests that create a blocking page
   // themselves and then simulate OnBlockingPageDone(). OnBlockingPageDone()
   // expects the whitelist to exist, but the tests don't necessarily call
   // DisplayBlockingPage(), which creates it.
   static void CreateWhitelistForTesting(content::WebContents* web_contents);
@@ skipping 15 matching lines @@
       const safe_browsing::HitReport& hit_report) override;
 
   // Creates a hit report for the given resource and calls
   // MaybeReportSafeBrowsingHit. This also notifies all observers in
   // |observer_list_|.
   void CreateAndSendHitReport(const UnsafeResource& resource) override;
 
   // Calls SafeBrowsingBlockingPage::ShowBlockingPage().
   void ShowBlockingPageForResource(const UnsafeResource& resource) override;
 
+  // Helper method to ensure hit reports are only sent when the user has
+  // opted in to extended reporting and is not currently in incognito mode.
+  static bool ShouldSendHitReport(const HitReport& hit_report,
+                                  content::WebContents* web_contents);
+
  private:
   friend class SafeBrowsingUIManagerTest;
   friend class TestSafeBrowsingUIManager;
 
   // Report permission action to SafeBrowsing servers.
   void ReportPermissionActionOnIOThread(
       const PermissionReportInfo& report_info);
 
   static GURL GetMainFrameWhitelistUrlForResourceForTesting(
       const safe_browsing::SafeBrowsingUIManager::UnsafeResource& resource);
 
   // Safebrowsing service.
   scoped_refptr<SafeBrowsingService> sb_service_;
 
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingUIManager);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_UI_MANAGER_H_