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

chrome/browser/safe_browsing/safe_browsing_service.h

Index: chrome/browser/safe_browsing/safe_browsing_service.h
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index 0f9ef893152587a4522fea7464ecdf214c4c22d2..dcb44b957aa62adab304acba6e1dd8759b133b59 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -30,14 +30,6 @@
 class PrefChangeRegistrar;
 class PrefService;
 class Profile;
-struct SafeBrowsingProtocolConfig;
-class SafeBrowsingDatabaseManager;
-class SafeBrowsingPingManager;
-class SafeBrowsingProtocolManager;
-class SafeBrowsingProtocolManagerDelegate;
-class SafeBrowsingServiceFactory;
-class SafeBrowsingUIManager;
-class SafeBrowsingURLRequestContextGetter;
 class TrackedPreferenceValidationDelegate;
 
 namespace base {
@@ -57,13 +49,20 @@ class URLRequestContextGetter;
 namespace safe_browsing {
 class ClientSideDetectionService;
 class DownloadProtectionService;
+struct SafeBrowsingProtocolConfig;
+class SafeBrowsingDatabaseManager;
+class SafeBrowsingPingManager;
+class SafeBrowsingProtocolManager;
+class SafeBrowsingProtocolManagerDelegate;
+class SafeBrowsingServiceFactory;
+class SafeBrowsingUIManager;
+class SafeBrowsingURLRequestContextGetter;
 
 #if defined(FULL_SAFE_BROWSING)
 class IncidentReportingService;
 class OffDomainInclusionDetector;
 class ResourceRequestDetector;
 #endif
-}  // namespace safe_browsing
 
 // Construction needs to happen on the main thread.
 // The SafeBrowsingService owns both the UI and Database managers which do
@@ -115,7 +114,7 @@ class SafeBrowsingService
     return enabled_by_prefs_;
   }
 
-  safe_browsing::ClientSideDetectionService*
+  ClientSideDetectionService*
       safe_browsing_detection_service() const {

[mattm, 2015/11/12 00:36:05]

Will this fit on a single line?

[vakh (old account. dont use), 2015/11/12 09:27:42]

Done.

     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return csd_service_.get();
@@ -123,7 +122,7 @@ class SafeBrowsingService
 
   // The DownloadProtectionService is not valid after the SafeBrowsingService
   // is destroyed.
-  safe_browsing::DownloadProtectionService*
+  DownloadProtectionService*
       download_protection_service() const {

[mattm, 2015/11/12 00:36:05]

Will this fit on a single line?

[vakh (old account. dont use), 2015/11/12 09:27:43]

Done.

     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     return download_service_.get();
@@ -150,7 +149,7 @@ class SafeBrowsingService
   // |callback| will be dropped if the service is not applicable for the
   // process.
   void RegisterDelayedAnalysisCallback(
-      const safe_browsing::DelayedAnalysisCallback& callback);
+      const DelayedAnalysisCallback& callback);

[mattm, 2015/11/12 00:36:05]

Will this fit on a single line?

[vakh (old account. dont use), 2015/11/12 09:27:43]

Done.

 #endif
 
   // Adds |download_manager| to the set monitored by safe browsing.
@@ -180,7 +179,7 @@ class SafeBrowsingService
   virtual SafeBrowsingUIManager* CreateUIManager();
 
 #if defined(FULL_SAFE_BROWSING)
-  virtual safe_browsing::IncidentReportingService*
+  virtual IncidentReportingService*
   CreateIncidentReportingService();

[mattm, 2015/11/12 00:36:05]

This should fit on a single line

[vakh (old account. dont use), 2015/11/12 09:27:43]

Done.

 #endif
 
@@ -287,15 +286,15 @@ class SafeBrowsingService
   // The ClientSideDetectionService is managed by the SafeBrowsingService,
   // since its running state and lifecycle depends on SafeBrowsingService's.
   // Accessed on UI thread.
-  scoped_ptr<safe_browsing::ClientSideDetectionService> csd_service_;
+  scoped_ptr<ClientSideDetectionService> csd_service_;
 
   // The DownloadProtectionService is managed by the SafeBrowsingService,
   // since its running state and lifecycle depends on SafeBrowsingService's.
   // Accessed on UI thread.
-  scoped_ptr<safe_browsing::DownloadProtectionService> download_service_;
+  scoped_ptr<DownloadProtectionService> download_service_;
 
 #if defined(FULL_SAFE_BROWSING)
-  scoped_ptr<safe_browsing::IncidentReportingService> incident_service_;
+  scoped_ptr<IncidentReportingService> incident_service_;
 #endif
 
   // The UI manager handles showing interstitials.  Accessed on both UI and IO
@@ -307,10 +306,9 @@ class SafeBrowsingService
   scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
 
 #if defined(FULL_SAFE_BROWSING)
-  scoped_ptr<safe_browsing::OffDomainInclusionDetector>
-      off_domain_inclusion_detector_;
+  scoped_ptr<OffDomainInclusionDetector> off_domain_inclusion_detector_;
 
-  scoped_ptr<safe_browsing::ResourceRequestDetector> resource_request_detector_;
+  scoped_ptr<ResourceRequestDetector> resource_request_detector_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingService);
@@ -326,4 +324,6 @@ class SafeBrowsingServiceFactory {
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingServiceFactory);
 };
 
+}  // namespace safe_browsing
+
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_SERVICE_H_