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

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORTING_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORTING_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 10 matching lines @@
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h"
 #include "chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h"
 #include "chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h"
 #include "chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h"
 #include "chrome/browser/safe_browsing/incident_reporting/last_download_finder.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
-class SafeBrowsingDatabaseManager;
-class SafeBrowsingService;
 class TrackedPreferenceValidationDelegate;
 
 namespace base {
 class TaskRunner;
 }
 
 namespace content {
 class DownloadManager;
 class NotificationDetails;
 class NotificationSource;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace safe_browsing {
 
 class ClientDownloadRequest;
 class ClientIncidentReport;
 class ClientIncidentReport_DownloadDetails;
 class ClientIncidentReport_EnvironmentData;
 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
 // begins operation when an incident is reported via the AddIncident method.
 // Incidents reported from a profile that is loading are held until the profile
 // is fully created. Incidents originating from profiles that do not participate
 // in safe browsing are dropped. Process-wide incidents are affiliated with a
 // profile that participates in safe browsing when one becomes available.
 // Following the addition of an incident that is not dropped, the service
 // collects environmental data, finds the most recent binary download, and waits
 // a bit. Additional incidents that arrive during this time are collated with
 // the initial incident. Finally, already-reported incidents are pruned and any
 // 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.
   ~IncidentReportingService() override;
 
   // Returns true if incident reporting is enabled for the given profile.
   static bool IsEnabledForProfile(Profile* profile);
 
   // Returns an object by which external components can add an incident to the
   // service. The object may outlive the service, but will no longer have any
@@ skipping 15 matching lines @@
   void AddDownloadManager(content::DownloadManager* download_manager);
 
  protected:
   // A pointer to a function that populates a protobuf with environment data.
   typedef void (*CollectEnvironmentDataFn)(
       ClientIncidentReport_EnvironmentData*);
 
   // 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);
 
   // Sets the function called by the service to collect environment data and the
   // task runner on which it is called. Used by unit tests to provide a fake
   // environment data collector.
   void SetCollectEnvironmentHook(
       CollectEnvironmentDataFn collect_environment_data_hook,
       const scoped_refptr<base::TaskRunner>& task_runner);
@@ skipping 139 matching lines @@
 
   // content::NotificationObserver methods.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
   base::ThreadChecker thread_checker_;
 
   // 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_;
 
   // A pointer to a function that collects environment data. The function will
   // be run by |environment_collection_task_runner_|. This is ordinarily
   // CollectEnvironmentData, but may be overridden by tests; see
   // SetCollectEnvironmentHook.
   CollectEnvironmentDataFn collect_environment_data_fn_;
 
@@ skipping 66 matching lines @@
   // that are posted during normal processing (e.g., environment collection,
   // safe browsing database checks, and report uploads).
   base::WeakPtrFactory<IncidentReportingService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IncidentReportingService);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_INCIDENT_REPORTING_SERVICE_H_