Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace.

chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h

Index: chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
index 9cd72a9fd89a142ea7aaf8b9d38d48af73c0439d..c0c9f70d53c72e1124a16253251861b0b69b5074 100644
--- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
+++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.h
@@ -28,8 +28,6 @@
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
-class SafeBrowsingDatabaseManager;
-class SafeBrowsingService;
 class TrackedPreferenceValidationDelegate;
 
 namespace base {
@@ -56,6 +54,8 @@ class ClientIncidentReport_ExtensionData;
 class ClientIncidentReport_IncidentData;
 class Incident;
 class IncidentReceiver;
+class SafeBrowsingDatabaseManager;
+class SafeBrowsingService;
 
 // A class that manages the collection of incidents and submission of incident
 // reports to the safe browsing client-side detection service. The service
@@ -71,9 +71,10 @@ class IncidentReceiver;
 // remaining are uploaded in an incident report.
 class IncidentReportingService : public content::NotificationObserver {
  public:
-  IncidentReportingService(SafeBrowsingService* safe_browsing_service,
-                           const scoped_refptr<net::URLRequestContextGetter>&
-                               request_context_getter);
+  IncidentReportingService(
+      safe_browsing::SafeBrowsingService* safe_browsing_service,

[Nathan Parker, 2015/11/11 21:23:36]

Can rm safe_browsing:: here and below.

[vakh (old account. dont use), 2015/11/11 23:22:46]

Done.

+      const scoped_refptr<net::URLRequestContextGetter>&
+          request_context_getter);
 
   // All incident collection, data collection, and uploads in progress are
   // dropped at destruction.
@@ -109,7 +110,7 @@ class IncidentReportingService : public content::NotificationObserver {
   // For testing so that the TaskRunner used for delayed analysis callbacks can
   // be specified.
   IncidentReportingService(
-      SafeBrowsingService* safe_browsing_service,
+      safe_browsing::SafeBrowsingService* safe_browsing_service,
       const scoped_refptr<net::URLRequestContextGetter>& request_context_getter,
       base::TimeDelta delayed_task_interval,
       const scoped_refptr<base::TaskRunner>& delayed_task_runner);
@@ -269,7 +270,7 @@ class IncidentReportingService : public content::NotificationObserver {
 
   // The safe browsing database manager, through which the whitelist killswitch
   // is checked.
-  scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
+  scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager> database_manager_;
 
   // Accessor for an URL context with which reports will be sent.
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;