Submit a sample of notification images to Safe Browsing

chrome/browser/safe_browsing/ping_manager.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/ping_manager.h"
 
 #include <utility>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "chrome/browser/safe_browsing/notification_image_reporter.h"
 #include "chrome/browser/safe_browsing/permission_reporter.h"
 #include "components/data_use_measurement/core/data_use_user_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/log/net_log_source_type.h"
 #include "net/ssl/ssl_info.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace {
 // Returns a dictionary with "url"=|url-spec| and "data"=|payload| for
 // netlogging the start phase of a ping.
 std::unique_ptr<base::Value> NetLogPingStartCallback(
     const net::NetLogWithSource& net_log,
     const GURL& url,
@@ skipping 40 matching lines @@
     net::URLRequestContextGetter* request_context_getter,
     const SafeBrowsingProtocolConfig& config)
     : client_name_(config.client_name),
       request_context_getter_(request_context_getter),
       url_prefix_(config.url_prefix) {
   DCHECK(!url_prefix_.empty());
 
   if (request_context_getter) {
     permission_reporter_.reset(
         new PermissionReporter(request_context_getter->GetURLRequestContext()));
+    notification_image_reporter_ = new NotificationImageReporter(
+        request_context_getter->GetURLRequestContext());
 
     net_log_ = net::NetLogWithSource::Make(
         request_context_getter->GetURLRequestContext()->net_log(),
         net::NetLogSourceType::SAFE_BROWSING);
   }
 
   version_ = SafeBrowsingProtocolManagerHelper::Version();
 }
 
 SafeBrowsingPingManager::~SafeBrowsingPingManager() {
@@ skipping 66 matching lines @@
 
   fetcher->Start();
   safebrowsing_reports_.insert(std::move(fetcher));
 }
 
 void SafeBrowsingPingManager::ReportPermissionAction(
     const PermissionReportInfo& report_info) {
   permission_reporter_->SendReport(report_info);
 }
 
+void SafeBrowsingPingManager::ReportNotificationImage(Profile* profile,
+                                                      const GURL& origin,
+                                                      const SkBitmap& image) {
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,

[johnme, 2017/01/11 17:50:53]

It's a shame that the PlatformNotificationServiceImpl has to post to the IO
thread to get the ping manager, only for the ping manager to have to post to the
UI thread for the NotificationImageReporter to check the SBER status. Any ideas
for simplifying this?

+      base::Bind(&NotificationImageReporter::ReportNotificationImageOnUI,
+                 notification_image_reporter_, profile, origin, image));
+}
+
 GURL SafeBrowsingPingManager::SafeBrowsingHitUrl(
     const safe_browsing::HitReport& hit_report) const {
   DCHECK(hit_report.threat_type == SB_THREAT_TYPE_URL_MALWARE ||
          hit_report.threat_type == SB_THREAT_TYPE_URL_PHISHING ||
          hit_report.threat_type == SB_THREAT_TYPE_URL_UNWANTED ||
          hit_report.threat_type == SB_THREAT_TYPE_BINARY_MALWARE_URL ||
          hit_report.threat_type == SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL ||
          hit_report.threat_type == SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL);
   std::string url = SafeBrowsingProtocolManagerHelper::ComposeUrl(
       url_prefix_, "report", client_name_, version_, std::string(),
@@ skipping 77 matching lines @@
           version_.c_str());
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty()) {
     base::StringAppendF(&url, "&key=%s",
                         net::EscapeQueryParamValue(api_key, true).c_str());
   }
   return GURL(url);
 }
 
 }  // namespace safe_browsing