Submit a sample of notification images to Safe Browsing

chrome/browser/notifications/platform_notification_service_impl.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/notifications/platform_notification_service_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics_action.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/notifications/notification_object_proxy.h"
 #include "chrome/browser/notifications/persistent_notification_delegate.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_storage.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/safe_browsing/ping_manager.h"
+#include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
 #include "content/public/browser/notification_event_dispatcher.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/notification_resources.h"
 #include "content/public/common/platform_notification_data.h"
 #include "extensions/features/features.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/url_constants.h"
 
 #if BUILDFLAG(ENABLE_BACKGROUND)
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
@@ skipping 31 matching lines @@
                         std::string profile_id,
                         bool incognito) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   DCHECK(profile_manager);
   profile_manager->LoadProfile(
       profile_id, incognito,
       base::Bind(&OnCloseNonPersistentNotificationProfileLoaded,
                  notification_id));
 }
 
+void ReportNotificationImageOnIOThread(
+    scoped_refptr<safe_browsing::SafeBrowsingService> safe_browsing_service,
+    Profile* profile,
+    const GURL& origin,
+    const SkBitmap& image) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  safe_browsing::SafeBrowsingPingManager* ping_manager =
+      safe_browsing_service->ping_manager();
+  if (ping_manager)
+    ping_manager->ReportNotificationImage(profile, origin, image);

[Peter Beverloo, 2017/01/11 18:23:56]

nit: since initializing and shutting down the ping manager happens on the IO
thread, where as are, you could avoid the null check by checking whether it's
still enabled. That takes away the "why could this be NULL" question from the
reader.
DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!safe_browsing_service->enabled())
  return;

safe_browsing_service->ping_manager()->ReportNotificationImage(
    profile, origin, image);
(or with a DCHECK if you prefer)

[johnme, 2017/01/11 20:05:07]

Done.

+}
+
 }  // namespace
 
 // static
 PlatformNotificationServiceImpl*
 PlatformNotificationServiceImpl::GetInstance() {
   return base::Singleton<PlatformNotificationServiceImpl>::get();
 }
 
 PlatformNotificationServiceImpl::PlatformNotificationServiceImpl()
     : test_display_service_(nullptr) {
@@ skipping 321 matching lines @@
       DisplayNameForContextMessage(profile, origin));
   notification.set_vibration_pattern(notification_data.vibration_pattern);
   notification.set_timestamp(notification_data.timestamp);
   notification.set_renotify(notification_data.renotify);
   notification.set_silent(notification_data.silent);
 
   if (!notification_resources.image.drawsNothing()) {
     notification.set_type(message_center::NOTIFICATION_TYPE_IMAGE);
     notification.set_image(
         gfx::Image::CreateFrom1xBitmap(notification_resources.image));
+    // n.b. this should only be posted once per notification.
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(
+            &ReportNotificationImageOnIOThread,
+            make_scoped_refptr(g_browser_process->safe_browsing_service()),

[Peter Beverloo, 2017/01/11 18:23:56]

I see a bunch of other features doing NULL checks on the
safe_browsing_service(). It appears that you need to call
g_browser_process->SetSafeBrowsingService() when running tests (i.e.
TestingBrowserProcess). Should probably do that too, or ensure that our tests
set one?

[johnme, 2017/01/11 20:05:07]

Done.

+            profile, origin, notification_resources.image));
   }
 
   // Badges are only supported on Android, primarily because it's the only
   // platform that makes good use of them in the status bar.
 #if defined(OS_ANDROID)
   // TODO(peter): Handle different screen densities instead of always using the
   // 1x bitmap - crbug.com/585815.
   notification.set_small_image(
       gfx::Image::CreateFrom1xBitmap(notification_resources.badge));
 #endif  // defined(OS_ANDROID)
@@ skipping 56 matching lines @@
   }
 #endif
 
   return base::string16();
 }
 
 void PlatformNotificationServiceImpl::SetNotificationDisplayServiceForTesting(
     NotificationDisplayService* display_service) {
   test_display_service_ = display_service;
 }